Merge of mysql-5.1-bugteam into mysql-trunk-merge.

This commit is contained in:
Davi Arnaut 2010-07-23 22:28:44 -03:00
commit 89a48f7dbd

View file

@ -2933,7 +2933,7 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex,
*/ */
if (res == FIND_FILES_DIR) if (res == FIND_FILES_DIR)
{ {
if (lex->sql_command != SQLCOM_SELECT) if (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND)
return 1; return 1;
thd->clear_error(); thd->clear_error();
return 2; return 2;