Skip to content

Commit 7bdc024

Browse files
committed
MDEV-29830 Assertion `table->versioned()' in THD::vers_insert_history_fast
remove assert temporarily, the proper fix comes after MDEV-29833
1 parent a6f9694 commit 7bdc024

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

mysql-test/suite/versioning/r/misc.result

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,15 @@ a s e
2121
8 2010-11-11 11:11:11.000000 2020-04-04 00:00:00.000000
2222
drop table t1;
2323
#
24+
# MDEV-29830 Assertion `table->versioned()' in THD::vers_insert_history_fast
25+
#
26+
create table t1 (a int) with system versioning;
27+
insert into t1 values (1),(2);
28+
create table t2 (a timestamp);
29+
insert into t2 (a) values (now()),(now());
30+
select * from t2 where a in (select row_start from t1);
31+
a
32+
drop table t1, t2;
33+
#
2434
# End of 10.11 tests
2535
#

mysql-test/suite/versioning/t/misc.test

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ set timestamp=default;
1616
select * from t1 for system_time all;
1717
drop table t1;
1818

19+
--echo #
20+
--echo # MDEV-29830 Assertion `table->versioned()' in THD::vers_insert_history_fast
21+
--echo #
22+
create table t1 (a int) with system versioning;
23+
insert into t1 values (1),(2);
24+
create table t2 (a timestamp);
25+
insert into t2 (a) values (now()),(now());
26+
select * from t2 where a in (select row_start from t1);
27+
drop table t1, t2;
28+
1929
--echo #
2030
--echo # End of 10.11 tests
2131
--echo #

sql/sql_class.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5577,7 +5577,6 @@ class THD: public THD_count, /* this must be first */
55775577

55785578
bool vers_insert_history_fast(const TABLE *table)
55795579
{
5580-
DBUG_ASSERT(table->versioned());
55815580
return table->versioned(VERS_TIMESTAMP) &&
55825581
(variables.option_bits & OPTION_INSERT_HISTORY) &&
55835582
lex->duplicates == DUP_ERROR;

0 commit comments

Comments
 (0)