diff options
| author | Michael Widenius <monty@askmonty.org> | 2015-01-29 15:12:32 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2015-01-29 15:12:32 +0200 |
| commit | b83f6925659c9966340cdca4a55d9ae87b949733 (patch) | |
| tree | 1ada44550d320b0483086acdc5945bee4c0b7d63 /sql/sql_derived.h | |
| parent | fb71449b10100e9a0f887b1585000fbfab294f3c (diff) | |
| download | mariadb-git-b83f6925659c9966340cdca4a55d9ae87b949733.tar.gz | |
MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML flow with views and triggers
Call mysql_derived_reinit() if we are reusing view.
This is needed as during a previous error condition the view may not have been reset
sql/sql_derived.cc:
More DBUG_PRINT
Always reset merged_for_insert (no reason to not do that)
sql/sql_derived.h:
Added prototype
sql/sql_insert.cc:
More DBUG_PRINT
Added DBUG_ASSERT
sql/sql_view.cc:
Call mysql_derived_reinit() if we are reusing view.
This is needed as during a previous error condition the view may not have been reset
sql/table.cc:
More DBUG_PRINT
Diffstat (limited to 'sql/sql_derived.h')
| -rw-r--r-- | sql/sql_derived.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_derived.h b/sql/sql_derived.h index f232445879e..1dffef7235b 100644 --- a/sql/sql_derived.h +++ b/sql/sql_derived.h @@ -23,6 +23,7 @@ struct LEX; bool mysql_handle_derived(LEX *lex, uint phases); bool mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases); bool mysql_handle_list_of_derived(LEX *lex, TABLE_LIST *dt_list, uint phases); +bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived); /** Cleans up the SELECT_LEX_UNIT for the derived table (if any). |