summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorGleb Shchepa <gshchepa@mysql.com>2008-10-09 20:24:31 +0500
committerGleb Shchepa <gshchepa@mysql.com>2008-10-09 20:24:31 +0500
commit0b38c93d6e1cc66eb798a59be817f744936b1505 (patch)
tree7a030e3d8bd24bd4a696e2b4f62c1a7eac37ae97 /sql/sql_union.cc
parent453bc6c1aa447eb888fbeb88c4e73632ec706623 (diff)
downloadmariadb-git-0b38c93d6e1cc66eb798a59be817f744936b1505.tar.gz
Bug#38499: flush tables and multitable table update with
derived table cause crash When a multi-UPDATE command fails to lock some table, and subsequently succeeds, the tables need to be reopened if they were altered. But the reopening procedure failed for derived tables. Extra cleanup has been added.
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index da5e118b069..2875aefbd97 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -399,7 +399,6 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
}
else
{
- DBUG_ASSERT(!thd->stmt_arena->is_conventional());
/*
We're in execution of a prepared statement or stored procedure:
reset field items to point at fields from the created temporary table.