Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/gluh/MySQL/Merge/5.0

mysql-test/r/information_schema.result

@@ -832,3 +832,6 @@ MODIFIES SQL DATA
 CONTAINS SQL
 drop procedure p1;
 drop procedure p2;
+show create database information_schema;
+Database	Create Database
+information_schema	CREATE DATABASE `information_schema` /*!40100 DEFAULT CHARACTER SET utf8 */

mysql-test/t/information_schema.test

@@ -552,3 +552,8 @@ select sql_data_access from information_schema.routines
 where specific_name like 'p%';
 drop procedure p1;
 drop procedure p2;
+
+#
+# Bug #9434 SHOW CREATE DATABASE information_schema;
+#
+show create database information_schema;

sql/sql_show.cc

@@ -448,7 +448,14 @@ bool mysqld_show_create_db(THD *thd, char *dbname,
     DBUG_RETURN(TRUE);
   }
 #endif
-
+  if (!my_strcasecmp(system_charset_info, dbname,
+                     information_schema_name.str))
+  {
+    dbname= information_schema_name.str;
+    create.default_table_charset= system_charset_info;
+  }
+  else
+  {
     (void) sprintf(path,"%s/%s",mysql_data_home, dbname);
     length=unpack_dirname(path,path);		// Convert if not unix
     found_libchar= 0;
@@ -466,7 +473,7 @@ bool mysqld_show_create_db(THD *thd, char *dbname,
       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));