bk commit into 5.0 tree (gluh:1.1845) BUG#10659

[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.1845 05/05/18 12:32:41 gluh@stripped +4 -0
  Fix for bug #10659: information_schema_db fail on Mac OS
    information schema name should be always in lower case

  sql/sql_show.cc
    1.246 05/05/18 12:31:30 gluh@stripped +6 -1
    Fix for bug #10659: information_schema_db fail on Mac OS
      information schema name should be always in lower case

  sql/sql_db.cc
    1.109 05/05/18 12:31:30 gluh@stripped +2 -0
    Fix for bug #10659: information_schema_db fail on Mac OS
      information schema name should be always in lower case

  mysql-test/t/information_schema_db.test
    1.2 05/05/18 12:31:30 gluh@stripped +1 -0
    Fix for bug #10659: information_schema_db fail on Mac OS

  mysql-test/r/information_schema_db.result
    1.2 05/05/18 12:31:30 gluh@stripped +5 -2
    Fix for bug #10659: information_schema_db fail on Mac OS

# 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.10659

--- 1.108/sql/sql_db.cc	Thu Apr 14 14:56:08 2005
+++ 1.109/sql/sql_db.cc	Wed May 18 12:31:30 2005
@@ -1049,6 +1049,8 @@
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
     db_access= SELECT_ACL;
 #endif
+    /* information schema name should be always in lower case */
+    my_casedn_str(files_charset_info, dbname);
     goto end;
   }
 

--- 1.245/sql/sql_show.cc	Tue May 17 13:50:40 2005
+++ 1.246/sql/sql_show.cc	Wed May 18 12:31:30 2005
@@ -3270,7 +3270,12 @@
   ST_FIELD_INFO *field_info= &schema_table->fields_info[2];
   buffer.length(0);
   buffer.append(field_info->old_name);
-  buffer.append(lex->select_lex.db);
+  if (!my_strcasecmp(system_charset_info, lex->select_lex.db, 
+                     information_schema_name.str))
+    /* information schema name should be always in lower case */
+    buffer.append(information_schema_name.str);
+  else
+    buffer.append(lex->select_lex.db);
   if (lex->wild && lex->wild->ptr())
   {
     buffer.append(" (");

--- 1.1/mysql-test/r/information_schema_db.result	Sat May  7 00:06:05 2005
+++ 1.2/mysql-test/r/information_schema_db.result	Wed May 18 12:31:30 2005
@@ -1,6 +1,9 @@
 use INFORMATION_SCHEMA;
+select database();
+database()
+information_schema
 show tables;
-Tables_in_INFORMATION_SCHEMA
+Tables_in_information_schema
 SCHEMATA
 TABLES
 COLUMNS
@@ -17,7 +20,7 @@
 TABLE_CONSTRAINTS
 KEY_COLUMN_USAGE
 show tables from INFORMATION_SCHEMA like 'T%';
-Tables_in_INFORMATION_SCHEMA (T%)
+Tables_in_information_schema (T%)
 TABLES
 TABLE_PRIVILEGES
 TABLE_CONSTRAINTS

--- 1.1/mysql-test/t/information_schema_db.test	Sat May  7 00:06:06 2005
+++ 1.2/mysql-test/t/information_schema_db.test	Wed May 18 12:31:30 2005
@@ -1,6 +1,7 @@
 -- source include/testdb_only.inc
 
 use INFORMATION_SCHEMA;
+select database();
 show tables;
 show tables from INFORMATION_SCHEMA like 'T%';
 create database `inf%`;