diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 51d655334f8..aab4caec5d4 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1767,6 +1767,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, /* Saved variable value */ my_bool old_innodb_table_locks= IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE); + /* used as fields initializator */ + lex_start(thd, 0, 0); statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS], diff --git a/sql/table.cc b/sql/table.cc index 507e5e163d6..809787a9203 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2538,11 +2538,11 @@ bool st_table_list::prepare_security(THD *thd) tbl->table->grant= grant; } thd->security_ctx= save_security_ctx; - DBUG_RETURN(FALSE); #else while ((tbl= tb++)) tbl->grant.privilege= ~NO_ACCESS; #endif + DBUG_RETURN(FALSE); }