summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2015-03-05 16:34:13 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2015-04-15 09:53:33 +0200
commitb9a75862eaa05708921b8fe9773ffe233048bebc (patch)
treef5804e42ebd08c62a0b3eb0b426e9133a9b1c42e /sql/sql_select.cc
parentcc84ac3be41d9d6ac480d55449d5bf4e324cca10 (diff)
downloadmariadb-git-b9a75862eaa05708921b8fe9773ffe233048bebc.tar.gz
MDEV-7613: MariaDB 5.5.40 server crash on update table left join with a view
Multi-update do not need full list of leaf tables. It also do not use it on prepare (mysql_multi_update_prepare()).
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8a53b98d812..3567c9c2bbd 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -646,9 +646,7 @@ JOIN::prepare(Item ***rref_pointer_array,
if (!(select_options & OPTION_SETUP_TABLES_DONE) &&
setup_tables_and_check_access(thd, &select_lex->context, join_list,
tables_list, select_lex->leaf_tables,
- FALSE, SELECT_ACL, SELECT_ACL,
- (thd->lex->sql_command ==
- SQLCOM_UPDATE_MULTI)))
+ FALSE, SELECT_ACL, SELECT_ACL, FALSE))
DBUG_RETURN(-1);
/*