Commit b1480cc0 authored by unknown's avatar unknown

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

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

parents ad7eebda 97cef22b
...@@ -470,7 +470,7 @@ s1 ...@@ -470,7 +470,7 @@ s1
drop table t1; drop table t1;
SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
Table Create Table Table Create Table
character_sets CREATE TEMPORARY TABLE `character_sets` ( CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
`CHARACTER_SET_NAME` varchar(64) NOT NULL default '', `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
`DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '', `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
`DESCRIPTION` varchar(60) NOT NULL default '', `DESCRIPTION` varchar(60) NOT NULL default '',
...@@ -479,7 +479,7 @@ character_sets CREATE TEMPORARY TABLE `character_sets` ( ...@@ -479,7 +479,7 @@ character_sets CREATE TEMPORARY TABLE `character_sets` (
set names latin2; set names latin2;
SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
Table Create Table Table Create Table
character_sets CREATE TEMPORARY TABLE `character_sets` ( CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` (
`CHARACTER_SET_NAME` varchar(64) NOT NULL default '', `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
`DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '', `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
`DESCRIPTION` varchar(60) NOT NULL default '', `DESCRIPTION` varchar(60) NOT NULL default '',
......
...@@ -396,7 +396,8 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) ...@@ -396,7 +396,8 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
else else
{ {
if (table_list->schema_table) if (table_list->schema_table)
protocol->store(table_list->schema_table_name, system_charset_info); protocol->store(table_list->schema_table->table_name,
system_charset_info);
else else
protocol->store(table->alias, system_charset_info); protocol->store(table->alias, system_charset_info);
if (store_create_info(thd, table_list, &buffer)) if (store_create_info(thd, table_list, &buffer))
...@@ -757,7 +758,7 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet) ...@@ -757,7 +758,7 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet)
else else
packet->append("CREATE TABLE ", 13); packet->append("CREATE TABLE ", 13);
if (table_list->schema_table) if (table_list->schema_table)
alias= table_list->schema_table_name; alias= table_list->schema_table->table_name;
else else
alias= (lower_case_table_names == 2 ? table->alias : alias= (lower_case_table_names == 2 ? table->alias :
share->table_name); share->table_name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment