bk commit into 5.0 tree (gluh:1.2102) BUG#17661

[gluh]

Below is the list of changes that have just been committed into a local
5.0 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
  1.2102 06/03/23 16:43:55 gluh@stripped +3 -0
  Fix for bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
   return information_schema.SCHEMATA.SCHEMA_NAME in lowercase if lower_case_table_name <> 0

  sql/sql_show.cc
    1.314 06/03/23 16:42:32 gluh@stripped +2 -0
    Fix for bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
     return information_schema.SCHEMATA.SCHEMA_NAME in lowercase if lower_case_table_name <> 0

  mysql-test/t/lowercase_table.test
    1.23 06/03/23 16:42:32 gluh@stripped +10 -0
    Fix for bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
     test case

  mysql-test/r/lowercase_table.result
    1.18 06/03/23 16:42:32 gluh@stripped +6 -0
    Fix for bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
     test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.0.17661

--- 1.313/sql/sql_show.cc	Mon Mar 20 14:17:41 2006
+++ 1.314/sql/sql_show.cc	Thu Mar 23 16:42:32 2006
@@ -2318,6 +2318,8 @@ int fill_schema_shemata(THD *thd, TABLE_
 	path[length-1]= FN_LIBCHAR;
       strmov(path+length, MY_DB_OPT_FILE);
       load_db_opt(thd, path, &create);
+      if (lower_case_table_names)
+        my_casedn_str(files_charset_info, file_name);
       if (store_schema_shemata(thd, table, file_name, 
                                create.default_table_charset))
         DBUG_RETURN(1);

--- 1.17/mysql-test/r/lowercase_table.result	Thu Sep  1 07:11:41 2005
+++ 1.18/mysql-test/r/lowercase_table.result	Thu Mar 23 16:42:32 2006
@@ -84,3 +84,9 @@ create table t2 like T1;
 drop table t1, t2;
 show tables;
 Tables_in_test
+show databases;
+Database
+information_schema
+mysqltest
+mysql
+test

--- 1.22/mysql-test/t/lowercase_table.test	Fri Sep 16 00:17:37 2005
+++ 1.23/mysql-test/t/lowercase_table.test	Thu Mar 23 16:42:32 2006
@@ -85,3 +85,13 @@ drop table t1, t2;
 show tables;
 
 # End of 4.1 tests
+
+#
+# Bug #17661 information_schema.SCHEMATA returns uppercase
+#            with lower_case_table_names = 1
+#
+--exec mkdir $MYSQLTEST_VARDIR/master-data/MYSQLTEST
+show databases;
+--exec rmdir $MYSQLTEST_VARDIR/master-data/MYSQLTEST
+
+# End of 5.0 tests