diff options
| author | gluh@gluh.mysql.r18.ru <> | 2005-01-28 19:09:27 +0300 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2005-01-28 19:09:27 +0300 |
| commit | 5dfcdcc0269f0dc7c817bb4e03d1d24cfee3e45f (patch) | |
| tree | 1da8dace2bbe8ed8e8599af794423d809cb38a19 /sql | |
| parent | 2f63bccc66c61be7e523ab89e21491728edd0f94 (diff) | |
| parent | 0434ecced3ea92f531c4dcc5c003290ce7da319a (diff) | |
| download | mariadb-git-5dfcdcc0269f0dc7c817bb4e03d1d24cfee3e45f.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index defa99f3a36..e9126871045 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3191,9 +3191,10 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list) views working correctly */ - table->alias_name_used= my_strcasecmp(table_alias_charset, - table_list->schema_table_name, - table_list->alias); + if (table_list->schema_table_name) + table->alias_name_used= my_strcasecmp(table_alias_charset, + table_list->schema_table_name, + table_list->alias); table_list->table_name= (char*) table->s->table_name; table_list->table= table; table->next= thd->derived_tables; |