- fixed unefficient SQL in browsing of events (Alexei)

   [svn merge -r4655:4658 svn://svn.zabbix.com/branches/1.4]


git-svn-id: svn://svn.zabbix.com/trunk@4659 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 3 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bd92140..570e5b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Changes for 1.5:
 
 Changes for 1.4.3:
 
+ - fixed unefficient SQL in browsing of events (Alexei)
  - fixed iregexp() (Alexei)
  - fixed detection of __VA_ARGS__ (Eugene)
  - added numeric parameters support for trigger description "$1 $2 .. $9" (Eugene)
diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index f83e3c69..7c115784 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -183,6 +183,7 @@ function event_initial_time($row,$show_unknown=0){
 					' FROM events '.
 					' WHERE objectid='.$row['triggerid'].$sql_cond.
 						' AND clock < '.$row['clock'].
+						' AND object='.EVENT_OBJECT_TRIGGER.
 					' GROUP BY value '.
 					' ORDER BY clock DESC');
 					
@@ -195,6 +196,7 @@ function event_initial_time($row,$show_unknown=0){
 		$res = DBselect('SELECT MIN(clock) as clock, value '.
 						' FROM events as e '.
 						' WHERE clock > '.$clock.$sql_cond.
+							' AND object='.EVENT_OBJECT_TRIGGER.
 							' AND objectid='.$row['triggerid'].
 							' AND clock < '.$row['clock'].
 						' GROUP BY value');