diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2018-07-24 01:59:15 +1000 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-08-24 11:20:06 +0200 |
| commit | db3be33ec877a3e39a18d46da8dc3ac364be8113 (patch) | |
| tree | a69e9c8d2948a7c14b42b8bd6f859e929391f852 | |
| parent | 6c6ca907ee84e3f129bc33be8202c0fee2f29196 (diff) | |
| download | mariadb-git-db3be33ec877a3e39a18d46da8dc3ac364be8113.tar.gz | |
MDEV-16783 Assertion `!conds' failed in mysql_delete upon 2nd execution of SP with DELETE HISTORY
* remove assertion
* do not setup `conds` if it's already cached
Fixes #823
| -rw-r--r-- | mysql-test/suite/versioning/r/truncate.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/t/truncate.test | 10 | ||||
| -rw-r--r-- | sql/sql_delete.cc | 14 |
3 files changed, 25 insertions, 5 deletions
diff --git a/mysql-test/suite/versioning/r/truncate.result b/mysql-test/suite/versioning/r/truncate.result index 308501915dc..d38b9eed162 100644 --- a/mysql-test/suite/versioning/r/truncate.result +++ b/mysql-test/suite/versioning/r/truncate.result @@ -100,5 +100,11 @@ ERROR 42S02: 'v' is a view unlock tables; drop view v; drop table t; +create table t1 (i int) with system versioning; +create procedure pr() delete history from t1 before system_time now(); +call pr; +call pr; +drop procedure pr; +drop table t1; drop database test; create database test; diff --git a/mysql-test/suite/versioning/t/truncate.test b/mysql-test/suite/versioning/t/truncate.test index 4e039a76567..1727c7787ef 100644 --- a/mysql-test/suite/versioning/t/truncate.test +++ b/mysql-test/suite/versioning/t/truncate.test @@ -107,5 +107,15 @@ unlock tables; drop view v; drop table t; +# +# MDEV-16783 Assertion `!conds' failed in mysql_delete upon 2nd execution of SP with DELETE HISTORY +# +create table t1 (i int) with system versioning; +create procedure pr() delete history from t1 before system_time now(); +call pr; +call pr; +drop procedure pr; +drop table t1; + drop database test; create database test; diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index b6ca2e956cb..a040ba9eb93 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -323,12 +323,16 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, DBUG_ASSERT(table); DBUG_ASSERT(!conds || thd->stmt_arena->is_stmt_execute()); - if (select_lex->vers_setup_conds(thd, table_list)) - DBUG_RETURN(TRUE); - DBUG_ASSERT(!conds); - conds= table_list->on_expr; - table_list->on_expr= NULL; + // conds could be cached from previous SP call + if (!conds) + { + if (select_lex->vers_setup_conds(thd, table_list)) + DBUG_RETURN(TRUE); + + conds= table_list->on_expr; + table_list->on_expr= NULL; + } } if (mysql_handle_list_of_derived(thd->lex, table_list, DT_MERGE_FOR_INSERT)) |