summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-10-06 11:09:18 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-10-06 11:09:18 +0400
commitb988331b71efbb75b58d10ee3c10b08d0f670394 (patch)
tree42369c16e0ab0a64df324e22fc20b723cf983320 /sql
parent30df032e28bada8aabc1c850799795c728cd96b7 (diff)
downloadmariadb-git-b988331b71efbb75b58d10ee3c10b08d0f670394.tar.gz
MDEV-462: SHOW EXPLAIN: Assertion `table_list->table' fails in find_field_in_table_ref ...
- Only allow basic constants as SHOW EXPLAIN arguments.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 3c697cb43af..217b60faa57 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2159,7 +2159,8 @@ mysql_execute_command(THD *thd)
}
Item **it= lex->value_list.head_ref();
- if ((!(*it)->fixed && (*it)->fix_fields(lex->thd, it)) ||
+ if (!(*it)->basic_const_item() ||
+ (!(*it)->fixed && (*it)->fix_fields(lex->thd, it)) ||
(*it)->check_cols(1))
{
my_message(ER_SET_CONSTANTS_ONLY, ER(ER_SET_CONSTANTS_ONLY),