after merge fix

This commit is contained in:
unknown 2007-10-04 17:08:59 +05:00
parent 0de3ea72e8
commit fca5cbe660

View File

@ -5770,8 +5770,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
/* /*
this check is used for show columns|keys from I_S hidden table this check is used for show columns|keys from I_S hidden table
*/ */
lex->orig_sql_command == SQLCOM_SHOW_FIELDS || lex->sql_command == SQLCOM_SHOW_FIELDS ||
lex->orig_sql_command == SQLCOM_SHOW_KEYS))) lex->sql_command == SQLCOM_SHOW_KEYS)))
{ {
my_error(ER_UNKNOWN_TABLE, MYF(0), my_error(ER_UNKNOWN_TABLE, MYF(0),
ptr->table_name, INFORMATION_SCHEMA_NAME.str); ptr->table_name, INFORMATION_SCHEMA_NAME.str);