- speed improvement for Overview screens (Eugene)

 - developed 'net.if.total[*]' parameter (Eugene)
 - fixed new map link adding (Eugene)
 - fixed host group adding (Eugene)
 - fixed map displaying (Eugene)
 - fixed 'No permissions' for 'Latest data','Triggers','Alarms' screens (Eugene)
 - fixed permision deletion (Eugene)
 - fixed 'get_map_by_sysmapid' function calls(Eugene)
 - improved php code execution speed (Eugene)


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

1 files changed, 20 insertions, 6 deletions

diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index c6f34cd0..2b3b337e 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -23,16 +23,15 @@
 // DATABASE CONFIGURATION
 
 //	$DB_TYPE	="POSTGRESQL";
-	$DB_TYPE	="ORACLE";
+	$DB_TYPE	="MYSQL";
+//	$DB_TYPE	="ORACLE";
 	$DB_SERVER	="localhost";
 //	$DB_DATABASE	="zabbix";
 //	$DB_DATABASE	="osmiy";
-//	$DB_DATABASE	="zabbix";
-	$DB_DATABASE	="osmiy";
-//	$DB_DATABASE	="demo";
+	$DB_DATABASE	="demo";
 //	$DB_DATABASE	="martinsj";
-	$DB_USER	="scott";
-	$DB_PASSWORD	="tiger";
+	$DB_USER	="root";
+	$DB_PASSWORD	="";
 // END OF DATABASE CONFIGURATION
 
 //	$USER_DETAILS	="";
@@ -68,13 +67,27 @@
 		}
 	}
 
+	/* NOTE:
+		LIMIT and OFFSET records
+		
+		Example: select 6-15 row.
 
+		MySQL:	
+			SELECT a FROM tbl LIMIT 5,10
+			SELECT a FROM tbl LIMIT 10 OFFSET 5
+		PostgreSQL:
+			SELECT a FROM tbl LIMIT 10 OFFSET 5
+		Oracle:
+			SELECT a FROM tbe WHERE ROWNUM < 15 // ONLY < 15
+			SELECT * FROM (SELECT ROWNUM as RN, * FROM tbl) WHERE RN BETWEEN 6 AND 15
+	*/
 
 	function	DBselect($query)
 	{
 		global $DB,$DB_TYPE;
 
 //		echo $query,"<br>";
+COpt::savesqlrequest($query);
 
 		if($DB_TYPE == "MYSQL")
 		{
@@ -113,6 +126,7 @@
 		global $DB,$DB_TYPE;
 
 //		echo $query,"<br>";
+COpt::savesqlrequest($query);
 
 		$result = FALSE;