Skip to content

Commit 2e43c45

Browse files
author
Alexander Barkov
committed
Fixing versioning.insert and versioning.replace test failes.
Tests started to fail after a merge of MDEV-15107 (from bb-10.2-ext to 10.3), because MDEV-15107 additionally fixed this problem: MDEV-15112 Inconsistent evaluation of spvariable=0 in strict mode Modifying tests not to reply on the pre-MDEV-15112 behavior.
1 parent f74023b commit 2e43c45

File tree

6 files changed

+5
-15
lines changed

6 files changed

+5
-15
lines changed

mysql-test/suite/versioning/common.inc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ begin
5353
return NULL;
5454
end~~
5555

56-
create function if not exists current_row(sys_trx_end varbinary(255))
57-
returns int
58-
deterministic
59-
begin
60-
declare continue handler for sqlwarning begin end;
61-
return sys_trx_end = timestamp'2038-01-19 03:14:07.999999'
62-
or sys_trx_end = 18446744073709551615;
63-
end~~
64-
6556
create function if not exists sys_commit_ts(sys_field varchar(255))
6657
returns varchar(255)
6758
deterministic

mysql-test/suite/versioning/common_finish.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ drop function default_engine;
55
drop function non_default_engine;
66
drop function sys_commit_ts;
77
drop function sys_datatype;
8-
drop function current_row;
98
drop procedure concat_exec2;
109
drop procedure concat_exec3;
1110
--enable_query_log

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ c varchar(8),
331331
period for system_time(s, e))
332332
with system versioning;
333333
insert into t1 values (1, null, null, 'foo');
334-
select i, c, current_row(e) from t1;
335-
i c current_row(e)
334+
select i, c, e>TIMESTAMP'2038-01-01 00:00:00' AS current_row from t1;
335+
i c current_row
336336
1 foo 1
337337
drop table t1;
338338
drop table t2;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
call create_table('t', 'x int');
22
insert t values (1, 2);
33
replace t values (1, 3);
4-
select *, current_row(row_end) as current from t for system_time all
4+
select *, row_end>TIMESTAMP'2038-01-01 00:00:00' as current from t for system_time all
55
order by x;
66
id x current
77
1 2 0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ create or replace table t1 (
225225
period for system_time(s, e))
226226
with system versioning;
227227
insert into t1 values (1, null, null, 'foo');
228-
select i, c, current_row(e) from t1;
228+
select i, c, e>TIMESTAMP'2038-01-01 00:00:00' AS current_row from t1;
229229

230230
drop table t1;
231231
drop table t2;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ call create_table('t', 'x int');
66

77
insert t values (1, 2);
88
replace t values (1, 3);
9-
select *, current_row(row_end) as current from t for system_time all
9+
select *, row_end>TIMESTAMP'2038-01-01 00:00:00' as current from t for system_time all
1010
order by x;
1111

1212
drop database test;

0 commit comments

Comments
 (0)