diff options
| author | unknown <ramil@mysql.com> | 2005-05-07 02:26:44 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-05-07 02:26:44 +0500 |
| commit | 930a245913d879d8e96edae48a87e45e83b4fe33 (patch) | |
| tree | 73277c5a591a6c36b5f5376f6aab24b1472f99df | |
| parent | 38d43503e568baa97f464084d80c0f79e8ad5f5f (diff) | |
| parent | 6397471f8846089b802ea24c1ec39035372a1f6f (diff) | |
| download | mariadb-git-930a245913d879d8e96edae48a87e45e83b4fe33.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
| -rw-r--r-- | mysql-test/r/information_schema.result | 6 | ||||
| -rw-r--r-- | sql/sql_show.cc | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index c53779582f1..26ebf492eb2 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -4,9 +4,9 @@ skip_show_database OFF 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 diff --git a/sql/sql_show.cc b/sql/sql_show.cc index cf0050a774b..9e89687c60d 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2000,11 +2000,12 @@ err: 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 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond) 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 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond) 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 @@ ST_FIELD_INFO schema_fields_info[]= {"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} }; |