diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-22 17:20:19 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-22 17:20:19 +0500 |
| commit | 9b92f5858adcc25f696d8d06cab90288c16641ac (patch) | |
| tree | ac62554cd04a830c61855b4a103c6e6b99f65b66 /sql/sql_show.cc | |
| parent | 98e66d2059e9f758785f487e4cbb4eaa405ad493 (diff) | |
| download | mariadb-git-9b92f5858adcc25f696d8d06cab90288c16641ac.tar.gz | |
Variables were rename, binary collation names were added
Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 25bbd4851ba..660b8e7e572 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1420,8 +1420,8 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) static bool write_collation(Protocol *protocol, CHARSET_INFO *cs) { protocol->prepare_for_resend(); - protocol->store(cs->csname, system_charset_info); protocol->store(cs->name, system_charset_info); + protocol->store(cs->csname, system_charset_info); protocol->store_short((longlong) cs->number); protocol->store((cs->state & MY_CS_PRIMARY) ? "Y" : "",system_charset_info); protocol->store((cs->state & MY_CS_COMPILED)? "Y" : "",system_charset_info); @@ -1440,8 +1440,8 @@ int mysqld_show_collations(THD *thd, const char *wild) DBUG_ENTER("mysqld_show_charsets"); - field_list.push_back(new Item_empty_string("Charset",30)); field_list.push_back(new Item_empty_string("Collation",30)); + field_list.push_back(new Item_empty_string("Charset",30)); field_list.push_back(new Item_return_int("Id",11, FIELD_TYPE_SHORT)); field_list.push_back(new Item_empty_string("D",30)); field_list.push_back(new Item_empty_string("C",30)); |