Download | Plain Text | No Line Numbers 

  1. diff -Naur phpMyAdmin.orig/libraries/database_interface.lib.php phpMyAdmin/libraries/database_interface.lib.php
  2. --- phpMyAdmin.orig/libraries/database_interface.lib.php	2008-04-29 14:16:21.000000000 +0200
  3. +++ phpMyAdmin/libraries/database_interface.lib.php	2008-05-25 18:33:46.000000000 +0200
  4. @@ -231,7 +231,7 @@
  5.  
  6.      $tables = array();
  7.  
  8. -    if (PMA_MYSQL_INT_VERSION >= 50002) {
  9. +    if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
  10.          // get table information from information_schema
  11.          if ($table) {
  12.              if (true === $tbl_is_group) {
  13. @@ -417,7 +417,7 @@
  14.  
  15.      $apply_limit_and_order_manual = true;
  16.  
  17. -    if (PMA_MYSQL_INT_VERSION >= 50002) {
  18. +    if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
  19.          /**
  20.           * if $GLOBALS['cfg']['NaturalOrder'] is enabled, we cannot use LIMIT
  21.           * cause MySQL does not support natural ordering, we have to do it afterward
  22. @@ -583,7 +583,7 @@
  23.  {
  24.      $columns = array();
  25.  
  26. -    if (PMA_MYSQL_INT_VERSION >= 50002) {
  27. +    if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
  28.          $sql_wheres = array();
  29.          $array_keys = array();
  30.  
  31. @@ -1270,7 +1270,7 @@
  32.      $result = array();
  33.  
  34.      // available in INFORMATION_SCHEMA since MySQL 5.0.10
  35. -    if (PMA_MYSQL_INT_VERSION >= 50010) {
  36. +    if (0 && PMA_MYSQL_INT_VERSION >= 50010) {
  37.          $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) . "';");
  38.  
  39.          if ($triggers) {
  40. diff -Naur phpMyAdmin.orig/libraries/db_routines.inc.php phpMyAdmin/libraries/db_routines.inc.php
  41. --- phpMyAdmin.orig/libraries/db_routines.inc.php	2008-04-29 14:16:21.000000000 +0200
  42. +++ phpMyAdmin/libraries/db_routines.inc.php	2008-05-25 18:35:04.000000000 +0200
  43. @@ -17,7 +17,7 @@
  44.   *       Of course the interface would need a way to pass calling parameters.
  45.   *       Also, support DEFINER (like we do in export).
  46.   */
  47. -if (PMA_MYSQL_INT_VERSION >= 50002) {
  48. +if (0 && PMA_MYSQL_INT_VERSION >= 50002) {
  49.      $url_query .= '&goto=db_structure.php';
  50.  
  51.      $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) . '\';');
  52. diff -Naur phpMyAdmin.orig/libraries/List_Database.class.php phpMyAdmin/libraries/List_Database.class.php
  53. --- phpMyAdmin.orig/libraries/List_Database.class.php	2008-04-29 14:16:21.000000000 +0200
  54. +++ phpMyAdmin/libraries/List_Database.class.php	2008-05-25 18:32:09.000000000 +0200
  55. @@ -169,6 +169,7 @@
  56.              }
  57.          }
  58.  
  59. +        $database_list = array_diff($database_list, array('information_schema'));
  60.          return $database_list;
  61.      }
  62.  
  63. diff -Naur phpMyAdmin.orig/libraries/mysql_charsets.lib.php phpMyAdmin/libraries/mysql_charsets.lib.php
  64. --- phpMyAdmin.orig/libraries/mysql_charsets.lib.php	2008-04-29 14:16:20.000000000 +0200
  65. +++ phpMyAdmin/libraries/mysql_charsets.lib.php	2008-05-25 18:20:24.000000000 +0200
  66. @@ -120,7 +120,7 @@
  67.              // information_schema database: We know it!
  68.              return 'utf8_general_ci';
  69.          }
  70. -        if (PMA_MYSQL_INT_VERSION >= 50006) {
  71. +        if (0 && PMA_MYSQL_INT_VERSION >= 50006) {
  72.              // Since MySQL 5.0.6, we don't have to parse SHOW CREATE DATABASE anymore.
  73.              return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
  74.          } elseif (PMA_MYSQL_INT_VERSION >= 40101) {
  75.