Download | Plain Text | Line Numbers


diff -Naur phpMyAdmin.orig/libraries/database_interface.lib.php phpMyAdmin/libraries/database_interface.lib.php
--- phpMyAdmin.orig/libraries/database_interface.lib.php	2008-04-29 14:16:21.000000000 +0200
+++ phpMyAdmin/libraries/database_interface.lib.php	2008-05-25 18:33:46.000000000 +0200
@@ -231,7 +231,7 @@
 
     $tables = array();
 
-    if (PMA_MYSQL_INT_VERSION >= 50002) {
+    if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
         // get table information from information_schema
         if ($table) {
             if (true === $tbl_is_group) {
@@ -417,7 +417,7 @@
 
     $apply_limit_and_order_manual = true;
 
-    if (PMA_MYSQL_INT_VERSION >= 50002) {
+    if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
         /**
          * if $GLOBALS['cfg']['NaturalOrder'] is enabled, we cannot use LIMIT
          * cause MySQL does not support natural ordering, we have to do it afterward
@@ -583,7 +583,7 @@
 {
     $columns = array();
 
-    if (PMA_MYSQL_INT_VERSION >= 50002) {
+    if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
         $sql_wheres = array();
         $array_keys = array();
 
@@ -1270,7 +1270,7 @@
     $result = array();
 
     // available in INFORMATION_SCHEMA since MySQL 5.0.10
-    if (PMA_MYSQL_INT_VERSION >= 50010) {
+    if (0 && PMA_MYSQL_INT_VERSION >= 50010) {
         $triggers = PMA_DBI_fetch_result("SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE EVENT_OBJECT_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "' and EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';");
 
         if ($triggers) {
diff -Naur phpMyAdmin.orig/libraries/db_routines.inc.php phpMyAdmin/libraries/db_routines.inc.php
--- phpMyAdmin.orig/libraries/db_routines.inc.php	2008-04-29 14:16:21.000000000 +0200
+++ phpMyAdmin/libraries/db_routines.inc.php	2008-05-25 18:35:04.000000000 +0200
@@ -17,7 +17,7 @@
  *       Of course the interface would need a way to pass calling parameters.
  *       Also, support DEFINER (like we do in export).
  */
-if (PMA_MYSQL_INT_VERSION >= 50002) {
+if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
     $url_query .= '&goto=db_structure.php';
 
     $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
diff -Naur phpMyAdmin.orig/libraries/List_Database.class.php phpMyAdmin/libraries/List_Database.class.php
--- phpMyAdmin.orig/libraries/List_Database.class.php	2008-04-29 14:16:21.000000000 +0200
+++ phpMyAdmin/libraries/List_Database.class.php	2008-05-25 18:32:09.000000000 +0200
@@ -169,6 +169,7 @@
             }
         }
 
+        $database_list = array_diff($database_list, array('information_schema'));
         return $database_list;
     }
 
diff -Naur phpMyAdmin.orig/libraries/mysql_charsets.lib.php phpMyAdmin/libraries/mysql_charsets.lib.php
--- phpMyAdmin.orig/libraries/mysql_charsets.lib.php	2008-04-29 14:16:20.000000000 +0200
+++ phpMyAdmin/libraries/mysql_charsets.lib.php	2008-05-25 18:20:24.000000000 +0200
@@ -120,7 +120,7 @@
             // information_schema database: We know it!
             return 'utf8_general_ci';
         }
-        if (PMA_MYSQL_INT_VERSION >= 50006) {
+        if (0 && PMA_MYSQL_INT_VERSION >= 50006) {
             // Since MySQL 5.0.6, we don't have to parse SHOW CREATE DATABASE anymore.
             return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
         } elseif (PMA_MYSQL_INT_VERSION >= 40101) {