diff options
author | Gleb Shchepa <gshchepa@mysql.com> | 2008-10-09 20:24:31 +0500 |
---|---|---|
committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-10-09 20:24:31 +0500 |
commit | a83f5b18efaa54df3b56c86c1ab9244280447f24 (patch) | |
tree | 7a030e3d8bd24bd4a696e2b4f62c1a7eac37ae97 /sql/sql_union.cc | |
parent | 7b628ade5f016ee2986a843b32162f30afcced91 (diff) | |
download | mariadb-git-a83f5b18efaa54df3b56c86c1ab9244280447f24.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.
mysql-test/r/lock_multi.result:
Added test case for bug #38499.
mysql-test/t/lock_multi.test:
Added test case for bug #38499.
sql/sql_union.cc:
Bug#38499: flush tables and multitable table update with
derived table cause crash
Obsolete assertion has been removed.
sql/sql_update.cc:
Bug#38499: flush tables and multitable table update with
derived table cause crash
Extra cleanup for derived tables has been added:
1) unit.cleanup(),
2) unit->reinit_exec_mechanism().
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 1 |
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. |