[Nagios-db-checkins] nagios-db/ui mysql_control.php,1.3,1.4

[Matthew K. <mat...@us...>]

Update of /cvsroot/nagios-db/nagios-db/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25761

Modified Files:
	mysql_control.php 
Log Message:
- finally went over the queries properly and fixed some mysql specific things
- sync up changes in postgres module/sql, results are 100% identical in testing now


Index: mysql_control.php
===================================================================
RCS file: /cvsroot/nagios-db/nagios-db/ui/mysql_control.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mysql_control.php	26 Jan 2005 03:01:42 -0000	1.3
--- mysql_control.php	1 Feb 2005 05:53:52 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  
  // our mysql calls
+ // probably a good idea to move these massive queries into some seperate includes ala postgres
  
  require_once 'shared_db.php';
***************
*** 45,49 ****
  								where
  									host.id = host_check.hostid and
[...1280 lines suppressed...]
! 			0 as duration,
! 			0 as current_attempt,
! 			service_check.max_attempts,
! 			null as plugin_output
! 		from
! 			host,
! 			service,
! 			service_check
! 		where
! 			host.id not in (select hostid from hostgroup_membership) and
! 			host.id = service.hostid and
! 			service.id = service_check.serviceid and
! 			service.configured = TRUE and
! 			service.has_been_checked = FALSE and
! 			host.has_been_checked = FALSE
! 		order by
! 			name
! 	) as host_details";
  		
  		$constrained = 0;