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 /mysql-test/suite/versioning | |
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
Diffstat (limited to 'mysql-test/suite/versioning')
-rw-r--r-- | mysql-test/suite/versioning/r/truncate.result | 6 | ||||
-rw-r--r-- | mysql-test/suite/versioning/t/truncate.test | 10 |
2 files changed, 16 insertions, 0 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; |