bk commit into 5.0 tree (gluh:1.1929) BUG#8998

[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.1929 05/05/06 20:14:22 gluh@stripped +2 -0
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
     DEFAULT_COLLTION_NAME field is added to SCHEMATA table

  sql/sql_show.cc
    1.239 05/05/06 20:14:16 gluh@stripped +6 -4
    Fix for bug#8998: information_schema: Table SCHEMATA should report default collations

  mysql-test/r/information_schema.result
    1.47 05/05/06 20:14:16 gluh@stripped +3 -3
    Fix for bug#8998: information_schema: Table SCHEMATA should report default collations

# 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:	mobby.(none)
# Root:	/home/gluh/MySQL/Bugs/5.0.8998

--- 1.238/sql/sql_show.cc	2005-05-05 15:05:59 +00:00
+++ 1.239/sql/sql_show.cc	2005-05-06 20:14:16 +00:00
@@ -2000,11 +2000,12 @@
 
 
 bool store_schema_shemata(THD* thd, TABLE *table, const char *db_name,
-                          const char* cs_name)
+                          CHARSET_INFO *cs)
 {
   restore_record(table, s->default_values);
   table->field[1]->store(db_name, strlen(db_name), system_charset_info);
-  table->field[2]->store(cs_name, strlen(cs_name), system_charset_info);
+  table->field[2]->store(cs->csname, strlen(cs->csname), system_charset_info);
+  table->field[3]->store(cs->name, strlen(cs->name), system_charset_info);
   return schema_table_store_record(thd, table);
 }
 
@@ -2035,7 +2036,7 @@
     if (with_i_schema)       // information schema name is always first in list
     {
       if (store_schema_shemata(thd, table, file_name,
-                               system_charset_info->csname))
+                               system_charset_info))
         DBUG_RETURN(1);
       with_i_schema= 0;
       continue;
@@ -2060,7 +2061,7 @@
       strmov(path+length, MY_DB_OPT_FILE);
       load_db_opt(thd, path, &create);
       if (store_schema_shemata(thd, table, file_name, 
-                               create.default_table_charset->csname))
+                               create.default_table_charset))
         DBUG_RETURN(1);
     }
   }
@@ -3482,6 +3483,7 @@
   {"CATALOG_NAME", FN_REFLEN, MYSQL_TYPE_STRING, 0, 1, 0},
   {"SCHEMA_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Database"},
   {"DEFAULT_CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 0, 0},
+  {"DEFAULT_COLLATION_NAME", 64, MYSQL_TYPE_STRING, 0, 0, 0},
   {"SQL_PATH", FN_REFLEN, MYSQL_TYPE_STRING, 0, 1, 0},
   {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
 };

--- 1.46/mysql-test/r/information_schema.result	2005-04-14 06:04:11 +00:00
+++ 1.47/mysql-test/r/information_schema.result	2005-05-06 20:14:16 +00:00
@@ -4,9 +4,9 @@
 grant select, update, execute on test.* to mysqltest_2@localhost;
 grant select, update on test.* to mysqltest_1@localhost;
 select * from information_schema.SCHEMATA where schema_name > 'm';
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	SQL_PATH
-NULL	mysql	latin1	NULL
-NULL	test	latin1	NULL
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+NULL	mysql	latin1	latin1_swedish_ci	NULL
+NULL	test	latin1	latin1_swedish_ci	NULL
 select schema_name from information_schema.schemata;
 schema_name
 information_schema