From 7bdc024fb0a1869ca793748a226b701295bc6542 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 20 Oct 2022 14:09:53 +0200 Subject: [PATCH] MDEV-29830 Assertion `table->versioned()' in THD::vers_insert_history_fast remove assert temporarily, the proper fix comes after MDEV-29833 --- mysql-test/suite/versioning/r/misc.result | 10 ++++++++++ mysql-test/suite/versioning/t/misc.test | 10 ++++++++++ sql/sql_class.h | 1 - 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/versioning/r/misc.result b/mysql-test/suite/versioning/r/misc.result index d74bb8607ed..22a83b24271 100644 --- a/mysql-test/suite/versioning/r/misc.result +++ b/mysql-test/suite/versioning/r/misc.result @@ -21,5 +21,15 @@ a s e 8 2010-11-11 11:11:11.000000 2020-04-04 00:00:00.000000 drop table t1; # +# MDEV-29830 Assertion `table->versioned()' in THD::vers_insert_history_fast +# +create table t1 (a int) with system versioning; +insert into t1 values (1),(2); +create table t2 (a timestamp); +insert into t2 (a) values (now()),(now()); +select * from t2 where a in (select row_start from t1); +a +drop table t1, t2; +# # End of 10.11 tests # diff --git a/mysql-test/suite/versioning/t/misc.test b/mysql-test/suite/versioning/t/misc.test index fd7808687bc..84d290f608b 100644 --- a/mysql-test/suite/versioning/t/misc.test +++ b/mysql-test/suite/versioning/t/misc.test @@ -16,6 +16,16 @@ set timestamp=default; select * from t1 for system_time all; drop table t1; +--echo # +--echo # MDEV-29830 Assertion `table->versioned()' in THD::vers_insert_history_fast +--echo # +create table t1 (a int) with system versioning; +insert into t1 values (1),(2); +create table t2 (a timestamp); +insert into t2 (a) values (now()),(now()); +select * from t2 where a in (select row_start from t1); +drop table t1, t2; + --echo # --echo # End of 10.11 tests --echo # diff --git a/sql/sql_class.h b/sql/sql_class.h index 5085db8f837..b7acea5ed3e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5577,7 +5577,6 @@ public: bool vers_insert_history_fast(const TABLE *table) { - DBUG_ASSERT(table->versioned()); return table->versioned(VERS_TIMESTAMP) && (variables.option_bits & OPTION_INSERT_HISTORY) && lex->duplicates == DUP_ERROR;