bk commit into 5.1 tree (gluh:1.2574) BUG#30795

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-28 17:33:30+05:00, gluh@stripped +3 -0
  Bug#30795 Query on INFORMATION_SCHEMA.SCHEMATA, wrong result
  skip the check of directory presence for 'information_schema' name

  mysql-test/r/information_schema.result@stripped, 2007-09-28 17:33:28+05:00, gluh@stripped
+4 -0
    test result

  mysql-test/t/information_schema.test@stripped, 2007-09-28 17:33:28+05:00, gluh@stripped +6
-0
    test case

  sql/sql_show.cc@stripped, 2007-09-28 17:33:29+05:00, gluh@stripped +2 -1
    skip the check of directory presence for 'information_schema' name

diff -Nrup a/mysql-test/r/information_schema.result
b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result	2007-09-28 16:02:41 +05:00
+++ b/mysql-test/r/information_schema.result	2007-09-28 17:33:28 +05:00
@@ -1552,4 +1552,8 @@ VIEW_DEFINITION
 SELECT *
 FROM INFORMATION_SCHEMA.TABLES
 DROP VIEW v1;
+SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA
+WHERE SCHEMA_NAME ='information_schema';
+SCHEMA_NAME
+information_schema
 End of 5.1 tests.
diff -Nrup a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
--- a/mysql-test/t/information_schema.test	2007-09-28 16:02:41 +05:00
+++ b/mysql-test/t/information_schema.test	2007-09-28 17:33:28 +05:00
@@ -1188,4 +1188,10 @@ FROM INFORMATION_SCHEMA.TABLES;
 SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS where TABLE_NAME = 'v1';
 DROP VIEW v1;
 
+#
+# Bug#30795 Query on INFORMATION_SCHEMA.SCHEMATA, wrong result
+#
+SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA
+WHERE SCHEMA_NAME ='information_schema';
+
 --echo End of 5.1 tests.
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-09-20 14:10:03 +05:00
+++ b/sql/sql_show.cc	2007-09-28 17:33:29 +05:00
@@ -3339,7 +3339,8 @@ int fill_schema_schemata(THD *thd, TABLE
   /*
     If we have lookup db value we should check that the database exists
   */
-  if(lookup_field_vals.db_value.str && !lookup_field_vals.wild_db_value)
+  if(lookup_field_vals.db_value.str && !lookup_field_vals.wild_db_value
&&
+     !with_i_schema)
   {
     char path[FN_REFLEN+16];
     uint path_len;