after merge fix

ce2430bc · gluh@mysql.com/eagle.(none) · 4741df18 · ce2430bc
Commit ce2430bc authored Oct 04, 2007 by gluh@mysql.com/eagle.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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
          */
-          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),
               ptr->table_name, INFORMATION_SCHEMA_NAME.str);