bk commit into 5.0 tree (gluh:1.1946) BUG#9434

[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.1946 05/06/08 16:26:07 gluh@stripped +3 -0
  Fix for bug#9434 SHOW CREATE DATABASE `information_schema`;
    added ability to do SHOW CREATE DATABASE `information_schema`
   

  sql/sql_show.cc
    1.250 05/06/08 16:25:09 gluh@stripped +22 -15
    Fix for bug#9434 SHOW CREATE DATABASE `information_schema`;
      added ability to do SHOW CREATE DATABASE `information_schema`
     

  mysql-test/t/information_schema.test
    1.39 05/06/08 16:25:09 gluh@stripped +5 -0
    Fix for bug#9434 SHOW CREATE DATABASE `information_schema`;

  mysql-test/r/information_schema.result
    1.56 05/06/08 16:25:09 gluh@stripped +3 -0
    Fix for bug#9434 SHOW CREATE DATABASE `information_schema`;

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

--- 1.249/sql/sql_show.cc	Wed Jun  1 18:35:04 2005
+++ 1.250/sql/sql_show.cc	Wed Jun  8 16:25:09 2005
@@ -448,25 +448,32 @@
     DBUG_RETURN(TRUE);
   }
 #endif
-
-  (void) sprintf(path,"%s/%s",mysql_data_home, dbname);
-  length=unpack_dirname(path,path);		// Convert if not unix
-  found_libchar= 0;
-  if (length && path[length-1] == FN_LIBCHAR)
+  if (!my_strcasecmp(system_charset_info, dbname,
+                     information_schema_name.str))
   {
-    found_libchar= 1;
-    path[length-1]=0;				// remove ending '\'
+    dbname= information_schema_name.str;
+    create.default_table_charset= system_charset_info;
   }
-  if (access(path,F_OK))
+  else
   {
-    my_error(ER_BAD_DB_ERROR, MYF(0), dbname);
-    DBUG_RETURN(TRUE);
+    (void) sprintf(path,"%s/%s",mysql_data_home, dbname);
+    length=unpack_dirname(path,path);		// Convert if not unix
+    found_libchar= 0;
+    if (length && path[length-1] == FN_LIBCHAR)
+    {
+      found_libchar= 1;
+      path[length-1]=0;				// remove ending '\'
+    }
+    if (access(path,F_OK))
+    {
+      my_error(ER_BAD_DB_ERROR, MYF(0), dbname);
+      DBUG_RETURN(TRUE);
+    }
+    if (found_libchar)
+      path[length-1]= FN_LIBCHAR;
+    strmov(path+length, MY_DB_OPT_FILE);
+    load_db_opt(thd, path, &create);
   }
-  if (found_libchar)
-    path[length-1]= FN_LIBCHAR;
-  strmov(path+length, MY_DB_OPT_FILE);
-  load_db_opt(thd, path, &create);
-
   List<Item> field_list;
   field_list.push_back(new Item_empty_string("Database",NAME_LEN));
   field_list.push_back(new Item_empty_string("Create Database",1024));

--- 1.55/mysql-test/r/information_schema.result	Tue Jun  7 11:30:59 2005
+++ 1.56/mysql-test/r/information_schema.result	Wed Jun  8 16:25:09 2005
@@ -823,3 +823,6 @@
 drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;
 use test;
 drop database mysqltest;
+show create database information_schema;
+Database	Create Database
+information_schema	CREATE DATABASE `information_schema` /*!40100 DEFAULT CHARACTER SET
utf8 */

--- 1.38/mysql-test/t/information_schema.test	Tue Jun  7 11:31:00 2005
+++ 1.39/mysql-test/t/information_schema.test	Wed Jun  8 16:25:09 2005
@@ -542,3 +542,8 @@
 drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;
 use test;
 drop database mysqltest;
+
+#
+# Bug #9434 SHOW CREATE DATABASE information_schema;
+#
+show create database information_schema;