From 235b68299bc112f9cb7be97af8d01bf904919a6b Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Sat, 18 Feb 2017 17:47:31 +0100
Subject: MDEV-9619: Assertion `null_ref_table' failed in virtual table_map
Item_direct_view_ref::used_tables() const on 2nd execution of PS
Refer left expression indirectly in case it changes from execution to execution.
---
sql/sql_update.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'sql/sql_update.cc')
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 060952a589d..ede38468513 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -361,7 +361,7 @@ int mysql_update(THD *thd,
table_list->grant.want_privilege= table->grant.want_privilege=
(SELECT_ACL & ~table->grant.privilege);
#endif
- if (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, 0))
+ if (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, NULL, 0))
{
free_underlaid_joins(thd, select_lex);
DBUG_RETURN(1); /* purecov: inspected */
@@ -1521,7 +1521,7 @@ int multi_update::prepare(List<Item> ¬_used_values,
reference tables
*/
- int error= setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, 0);
+ int error= setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, NULL, 0);
ti.rewind();
while ((table_ref= ti++))
--
cgit v1.2.1