Merge 10.4 into 10.5

13 files changed, 208 insertions, 70 deletions

diff --git a/mysql-test/suite/versioning/common.inc b/mysql-test/suite/versioning/common.inc
index 355b571e5a0..efb081a02e4 100644
--- a/mysql-test/suite/versioning/common.inc
+++ b/mysql-test/suite/versioning/common.inc
@@ -50,6 +50,10 @@ if ($MTR_COMBINATION_MYISAM)
 {
   --let $MTR_COMBINATION_TIMESTAMP= 1
 }
+if ($MTR_COMBINATION_TRADITIONAL)
+{
+  --let $MTR_COMBINATION_TIMESTAMP= 1
+}
 if ($MTR_COMBINATION_HEAP)
 {
   --let $MTR_COMBINATION_TIMESTAMP= 1
diff --git a/mysql-test/suite/versioning/engines.combinations b/mysql-test/suite/versioning/engines.combinations
index 26b5bab23f1..57e2af6cd06 100644
--- a/mysql-test/suite/versioning/engines.combinations
+++ b/mysql-test/suite/versioning/engines.combinations
@@ -7,5 +7,10 @@ default-storage-engine=innodb
 [myisam]
 default-storage-engine=myisam
 
+[traditional]
+default-storage-engine=myisam
+sql-mode=traditional
+
 [heap]
 default-storage-engine=memory
+
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index 874c617d049..b357ae390af 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -1021,6 +1021,88 @@ insert into t2 values (0), (2);
 update t1 left join t2 on a > b set b= 2 order by b;
 drop table t1, t2;
 #
+# MDEV-17091 Assertion `old_part_id == m_last_part' failed in
+# ha_partition::update_row or `part_id == m_last_part' in
+# ha_partition::delete_row upon UPDATE/DELETE after dropping versioning
+#
+create or replace table t1 (pk int primary key, f int) engine=innodb
+with system versioning
+partition by key() partitions 2;
+insert into t1 values (1,10),(2,20);
+# expected to hit same partition
+select * from t1 partition (p0);
+pk	f
+1	10
+2	20
+alter table t1 drop system versioning;
+# 1 and 2 are expected to be in different partitions
+select * from t1 partition(p0);
+pk	f
+1	10
+select * from t1 partition(p1);
+pk	f
+2	20
+update t1 set f=pk;
+delete from t1;
+drop table t1;
+#
+# MDEV-22413 Server hangs upon UPDATE/DELETE on a view reading from versioned partitioned table
+#
+create or replace table t1 (f char(6)) engine innodb with system versioning;
+insert into t1 values (null);
+update t1 set f= 'foo';
+update t1 set f= 'bar';
+create or replace view v1 as select * from t1 for system_time all;
+update v1 set f = '';
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+create or replace table t1 (f char(6)) engine innodb with system versioning
+partition by system_time limit 1
+(partition p1 history, partition p2 history, partition pn current);
+insert into t1 values (null);
+update t1 set f= 'foo';
+update t1 set f= 'bar';
+create or replace view v1 as select * from t1 for system_time all;
+update v1 set f= '';
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+delete from v1;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+drop view v1;
+drop table t1;
+# End of 10.3 tests
+#
+# MDEV-22283 Server crashes in key_copy or unexpected error 156: The table already existed in the storage engine
+#
+create table t1 (a int primary key) engine=aria page_checksum=0
+with system versioning
+partition by system_time (partition p1 history, partition pn current);
+alter table t1 add partition (partition p2 history);
+Warnings:
+Warning	4115	Maybe missing parameters: no rotation condition for multiple HISTORY partitions.
+show table status;
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
+t1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Got error 174 "Fatal error during initialization of handler" from storage engine Aria	NULL	NULL
+Warnings:
+Warning	1030	Got error 174 "Fatal error during initialization of handler" from storage engine Aria
+drop table t1;
+create table t1 (b int) engine=aria row_format=dynamic with system versioning
+partition by system_time (partition p1 history, partition pn current);
+insert into t1 values (1);
+replace into t1 values (1);
+drop table t1;
+#
+# MDEV-18794 Assertion `!m_innodb' failed in ha_partition::cmp_ref upon SELECT from partitioned table
+#
+create or replace table t1 (pk int auto_increment, i int, c char(1), primary key (pk), key(i))
+engine=innodb with system versioning partition by key() partitions 2;
+insert into t1 (i, c) values (1, 'a'), (2, 'b'), (null, 'c'), (null, 'b');
+alter table t1 drop system versioning;
+replace into t1 select * from t1;
+select * from t1 where i > 0 or pk = 1000 limit 1;
+pk	i	c
+1	1	a
+drop table t1;
+# End of 10.4 tests
+#
 # MDEV-22153 ALTER add default history partitions makes table inaccessible
 #
 create or replace table t1 (x int) with system versioning partition by system_time;
@@ -1056,31 +1138,6 @@ t1	CREATE TABLE `t1` (
 PARTITIONS 8
 drop tables t1;
 #
-# MDEV-17091 Assertion `old_part_id == m_last_part' failed in
-# ha_partition::update_row or `part_id == m_last_part' in
-# ha_partition::delete_row upon UPDATE/DELETE after dropping versioning
-#
-create or replace table t1 (pk int primary key, f int) engine=innodb
-with system versioning
-partition by key() partitions 2;
-insert into t1 values (1,10),(2,20);
-# expected to hit same partition
-select * from t1 partition (p0);
-pk	f
-1	10
-2	20
-alter table t1 drop system versioning;
-# 1 and 2 are expected to be in different partitions
-select * from t1 partition(p0);
-pk	f
-1	10
-select * from t1 partition(p1);
-pk	f
-2	20
-update t1 set f=pk;
-delete from t1;
-drop table t1;
-#
 # MDEV-22207 Drop default history partitions renders table inaccessible
 #
 create or replace table t1 (i int) with system versioning
@@ -1149,3 +1206,6 @@ t1	CREATE TABLE `t1` (
  PARTITION `p16` HISTORY ENGINE = DEFAULT_ENGINE,
  PARTITION `pn` CURRENT ENGINE = DEFAULT_ENGINE)
 drop tables t1;
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/suite/versioning/r/select.result b/mysql-test/suite/versioning/r/select.result
index d33edb50968..3489909e925 100644
--- a/mysql-test/suite/versioning/r/select.result
+++ b/mysql-test/suite/versioning/r/select.result
@@ -45,7 +45,7 @@ ASOF_x	y
 7	107
 8	108
 9	109
-select x as FROMTO_x, y from t1 for system_time from timestamp '0-0-0 0:0:0' to timestamp @t1;
+select x as FROMTO_x, y from t1 for system_time from timestamp '1970-01-01 00:00:00' to timestamp @t1;
 FROMTO_x	y
 0	100
 1	101
@@ -57,7 +57,7 @@ FROMTO_x	y
 7	107
 8	108
 9	109
-select x as BETWAND_x, y from t1 for system_time between timestamp '0-0-0 0:0:0' and timestamp @t1;
+select x as BETWAND_x, y from t1 for system_time between timestamp '1970-01-01 00:00:00' and timestamp @t1;
 BETWAND_x	y
 0	100
 1	101
@@ -242,8 +242,7 @@ ERROR HY000: Table `t1` is not system-versioned
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
 select * from t1 for system_time all for update;
-x
-1
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
 a
@@ -284,7 +283,7 @@ a	b
 select * from (select * from (select * from t1 cross join t2) as tmp1) as tmp2;
 a	b
 1	2
-select * from (select * from t1 cross join t2 for system_time as of timestamp ('0-0-0')) as tmp;
+select * from (select * from t1 cross join t2 for system_time as of timestamp ('1970-01-01 00:00:00')) as tmp;
 a	b
 create or replace table t1(a1 int) with system versioning;
 create or replace table t2(a2 int) with system versioning;
diff --git a/mysql-test/suite/versioning/r/select2,trx_id.rdiff b/mysql-test/suite/versioning/r/select2,trx_id.rdiff
index 89399516777..bdc20d1dc4f 100644
--- a/mysql-test/suite/versioning/r/select2,trx_id.rdiff
+++ b/mysql-test/suite/versioning/r/select2,trx_id.rdiff
@@ -22,7 +22,7 @@
  7	107
  8	108
  9	109
--select x as FROMTO2_x, y from t1 for system_time from '0-0-0 0:0:0' to @t1;
+-select x as FROMTO2_x, y from t1 for system_time from '1970-01-01 00:00' to @t1;
 +select x as FROMTO2_x, y from t1 for system_time from transaction @x0 to transaction @x1;
  FROMTO2_x	y
  0	100
@@ -31,7 +31,7 @@
  7	107
  8	108
  9	109
--select x as BETWAND2_x, y from t1 for system_time between '0-0-0 0:0:0' and @t1;
+-select x as BETWAND2_x, y from t1 for system_time between '1970-01-01 00:00' and timestamp @t1;
 +select x as BETWAND2_x, y from t1 for system_time between transaction @x0 and transaction @x1;
  BETWAND2_x	y
  0	100
diff --git a/mysql-test/suite/versioning/r/select2.result b/mysql-test/suite/versioning/r/select2.result
index abe1c821172..353bdf8e696 100644
--- a/mysql-test/suite/versioning/r/select2.result
+++ b/mysql-test/suite/versioning/r/select2.result
@@ -48,7 +48,7 @@ ASOF_x	y
 7	107
 8	108
 9	109
-select x as FROMTO_x, y from t1 for system_time from '0-0-0 0:0:0' to timestamp @t1;
+select x as FROMTO_x, y from t1 for system_time from '1970-01-01 00:00' to timestamp @t1;
 FROMTO_x	y
 0	100
 1	101
@@ -60,7 +60,7 @@ FROMTO_x	y
 7	107
 8	108
 9	109
-select x as BETWAND_x, y from t1 for system_time between '0-0-0 0:0:0' and timestamp @t1;
+select x as BETWAND_x, y from t1 for system_time between '1970-01-01 00:00' and timestamp @t1;
 BETWAND_x	y
 0	100
 1	101
@@ -98,7 +98,7 @@ ASOF2_x	y
 7	107
 8	108
 9	109
-select x as FROMTO2_x, y from t1 for system_time from '0-0-0 0:0:0' to @t1;
+select x as FROMTO2_x, y from t1 for system_time from '1970-01-01 00:00' to @t1;
 FROMTO2_x	y
 0	100
 1	101
@@ -110,7 +110,7 @@ FROMTO2_x	y
 7	107
 8	108
 9	109
-select x as BETWAND2_x, y from t1 for system_time between '0-0-0 0:0:0' and @t1;
+select x as BETWAND2_x, y from t1 for system_time between '1970-01-01 00:00' and timestamp @t1;
 BETWAND2_x	y
 0	100
 1	101
@@ -233,8 +233,7 @@ ERROR HY000: Table `t1` is not system-versioned
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
 select * from t1 for system_time as of now() for update;
-x
-1
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
 a
@@ -275,7 +274,7 @@ a	b
 select * from (select * from (select * from t1 cross join t2) as tmp1) as tmp2;
 a	b
 1	2
-select * from (select * from t1 cross join t2 for system_time as of timestamp ('0-0-0')) as tmp;
+select * from (select * from t1 cross join t2 for system_time as of timestamp ('1970-01-01 00:00')) as tmp;
 a	b
 create or replace table t1(a1 int) with system versioning;
 create or replace table t2(a2 int) with system versioning;
diff --git a/mysql-test/suite/versioning/r/sysvars.result b/mysql-test/suite/versioning/r/sysvars.result
index 165458ef170..93d99273a40 100644
--- a/mysql-test/suite/versioning/r/sysvars.result
+++ b/mysql-test/suite/versioning/r/sysvars.result
@@ -134,11 +134,11 @@ select * from t for system_time all;
 a
 2
 1
-select * from t for system_time from '0-0-0' to current_timestamp(6);
+select * from t for system_time from '1970-01-01 00:00' to current_timestamp(6);
 a
 2
 1
-select * from t for system_time between '0-0-0' and current_timestamp(6);
+select * from t for system_time between '1970-01-01 00:00' and current_timestamp(6);
 a
 2
 1
diff --git a/mysql-test/suite/versioning/r/view.result b/mysql-test/suite/versioning/r/view.result
index 3b3fe580af4..e9e74899790 100644
--- a/mysql-test/suite/versioning/r/view.result
+++ b/mysql-test/suite/versioning/r/view.result
@@ -79,7 +79,7 @@ create or replace view vt12 as select * from t1 cross join t2;
 select * from vt12;
 a	b
 1	2
-create or replace view vt12 as select * from t1 for system_time as of timestamp ('0-0-0') cross join t2;
+create or replace view vt12 as select * from t1 for system_time as of timestamp ('1970-01-01 00:00') cross join t2;
 select * from vt12;
 a	b
 # VIEW improvements [tempesta-tech/mariadb#183]
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
index e64fc09b8e7..c6b89a23abd 100644
--- a/mysql-test/suite/versioning/t/partition.test
+++ b/mysql-test/suite/versioning/t/partition.test
@@ -854,21 +854,6 @@ update t1 left join t2 on a > b set b= 2 order by b;
 drop table t1, t2;
 
 --echo #
---echo # MDEV-22153 ALTER add default history partitions makes table inaccessible
---echo #
-create or replace table t1 (x int) with system versioning partition by system_time;
-alter table t1 add partition partitions 1;
---replace_result $default_engine DEFAULT_ENGINE
-show create table t1;
-alter table t1 add partition partitions 2;
---replace_result $default_engine DEFAULT_ENGINE
-show create table t1;
-alter table t1 add partition partitions 3;
---replace_result $default_engine DEFAULT_ENGINE
-show create table t1;
-drop tables t1;
-
---echo #
 --echo # MDEV-17091 Assertion `old_part_id == m_last_part' failed in
 --echo # ha_partition::update_row or `part_id == m_last_part' in
 --echo # ha_partition::delete_row upon UPDATE/DELETE after dropping versioning
@@ -890,6 +875,86 @@ delete from t1;
 drop table t1;
 
 --echo #
+--echo # MDEV-22413 Server hangs upon UPDATE/DELETE on a view reading from versioned partitioned table
+--echo #
+create or replace table t1 (f char(6)) engine innodb with system versioning;
+
+insert into t1 values (null);
+update t1 set f= 'foo';
+update t1 set f= 'bar';
+
+create or replace view v1 as select * from t1 for system_time all;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+update v1 set f = '';
+
+create or replace table t1 (f char(6)) engine innodb with system versioning
+partition by system_time limit 1
+(partition p1 history, partition p2 history, partition pn current);
+
+insert into t1 values (null);
+update t1 set f= 'foo';
+update t1 set f= 'bar';
+
+create or replace view v1 as select * from t1 for system_time all;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+update v1 set f= '';
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+delete from v1;
+
+# cleanup
+drop view v1;
+drop table t1;
+
+--echo # End of 10.3 tests
+
+--echo #
+--echo # MDEV-22283 Server crashes in key_copy or unexpected error 156: The table already existed in the storage engine
+--echo #
+create table t1 (a int primary key) engine=aria page_checksum=0
+with system versioning
+partition by system_time (partition p1 history, partition pn current);
+
+alter table t1 add partition (partition p2 history);
+show table status;
+drop table t1;
+
+create table t1 (b int) engine=aria row_format=dynamic with system versioning
+partition by system_time (partition p1 history, partition pn current);
+insert into t1 values (1);
+replace into t1 values (1);
+
+# cleanup
+drop table t1;
+
+--echo #
+--echo # MDEV-18794 Assertion `!m_innodb' failed in ha_partition::cmp_ref upon SELECT from partitioned table
+--echo #
+create or replace table t1 (pk int auto_increment, i int, c char(1), primary key (pk), key(i))
+engine=innodb with system versioning partition by key() partitions 2;
+insert into t1 (i, c) values (1, 'a'), (2, 'b'), (null, 'c'), (null, 'b');
+alter table t1 drop system versioning;
+replace into t1 select * from t1;
+select * from t1 where i > 0 or pk = 1000 limit 1;
+drop table t1;
+
+--echo # End of 10.4 tests
+
+--echo #
+--echo # MDEV-22153 ALTER add default history partitions makes table inaccessible
+--echo #
+create or replace table t1 (x int) with system versioning partition by system_time;
+alter table t1 add partition partitions 1;
+--replace_result $default_engine DEFAULT_ENGINE
+show create table t1;
+alter table t1 add partition partitions 2;
+--replace_result $default_engine DEFAULT_ENGINE
+show create table t1;
+alter table t1 add partition partitions 3;
+--replace_result $default_engine DEFAULT_ENGINE
+show create table t1;
+drop tables t1;
+
+--echo #
 --echo # MDEV-22207 Drop default history partitions renders table inaccessible
 --echo #
 create or replace table t1 (i int) with system versioning
@@ -920,4 +985,8 @@ show create table t1;
 
 drop tables t1;
 
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
 --source suite/versioning/common_finish.inc
diff --git a/mysql-test/suite/versioning/t/select.test b/mysql-test/suite/versioning/t/select.test
index c8932ddf272..6c3e401e1cb 100644
--- a/mysql-test/suite/versioning/t/select.test
+++ b/mysql-test/suite/versioning/t/select.test
@@ -48,8 +48,8 @@ if ($MTR_COMBINATION_TRX_ID)
 
 select x, y from t1;
 select x as ASOF_x, y from t1 for system_time as of timestamp @t0;
-select x as FROMTO_x, y from t1 for system_time from timestamp '0-0-0 0:0:0' to timestamp @t1;
-select x as BETWAND_x, y from t1 for system_time between timestamp '0-0-0 0:0:0' and timestamp @t1;
+select x as FROMTO_x, y from t1 for system_time from timestamp '1970-01-01 00:00:00' to timestamp @t1;
+select x as BETWAND_x, y from t1 for system_time between timestamp '1970-01-01 00:00:00' and timestamp @t1;
 select x as ALL_x, y from t1 for system_time all;
 
 --disable_query_log
@@ -62,8 +62,8 @@ if ($MTR_COMBINATION_TRX_ID)
 if ($MTR_COMBINATION_TIMESTAMP)
 {
   select x as ASOF2_x, y from t1 for system_time as of @t0;
-  select x as FROMTO2_x, y from t1 for system_time from timestamp '0-0-0 0:0:0' to timestamp @t1;
-  select x as BETWAND2_x, y from t1 for system_time between timestamp '0-0-0 0:0:0' and timestamp @t1;
+  select x as FROMTO2_x, y from t1 for system_time from timestamp '1970-01-01 00:00:00' to timestamp @t1;
+  select x as BETWAND2_x, y from t1 for system_time between timestamp '1970-01-01 00:00:00' and timestamp @t1;
 }
 --enable_query_log
 
@@ -149,6 +149,7 @@ select * from t1 for system_time all;
 
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
 select * from t1 for system_time all for update;
 
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
@@ -186,7 +187,7 @@ insert into t1 values (1);
 insert into t2 values (2);
 select * from (select * from t1 cross join t2) as tmp;
 select * from (select * from (select * from t1 cross join t2) as tmp1) as tmp2;
-select * from (select * from t1 cross join t2 for system_time as of timestamp ('0-0-0')) as tmp;
+select * from (select * from t1 cross join t2 for system_time as of timestamp ('1970-01-01 00:00:00')) as tmp;
 
 create or replace table t1(a1 int) with system versioning;
 create or replace table t2(a2 int) with system versioning;
diff --git a/mysql-test/suite/versioning/t/select2.test b/mysql-test/suite/versioning/t/select2.test
index f624c512c87..1ab7bcf27c1 100644
--- a/mysql-test/suite/versioning/t/select2.test
+++ b/mysql-test/suite/versioning/t/select2.test
@@ -36,8 +36,8 @@ if($MTR_COMBINATION_TRX_ID) {
 
 select x, y from t1;
 select x as ASOF_x, y from t1 for system_time as of timestamp @t0;
-select x as FROMTO_x, y from t1 for system_time from '0-0-0 0:0:0' to timestamp @t1;
-select x as BETWAND_x, y from t1 for system_time between '0-0-0 0:0:0' and timestamp @t1;
+select x as FROMTO_x, y from t1 for system_time from '1970-01-01 00:00' to timestamp @t1;
+select x as BETWAND_x, y from t1 for system_time between '1970-01-01 00:00' and timestamp @t1;
 select x as ALL_x, y from t1 for system_time all;
 
 if($MTR_COMBINATION_TRX_ID) {
@@ -47,8 +47,8 @@ if($MTR_COMBINATION_TRX_ID) {
 }
 if(!$MTR_COMBINATION_TRX_ID) {
   select x as ASOF2_x, y from t1 for system_time as of @t0;
-  select x as FROMTO2_x, y from t1 for system_time from '0-0-0 0:0:0' to @t1;
-  select x as BETWAND2_x, y from t1 for system_time between '0-0-0 0:0:0' and @t1;
+  select x as FROMTO2_x, y from t1 for system_time from '1970-01-01 00:00' to @t1;
+  select x as BETWAND2_x, y from t1 for system_time between '1970-01-01 00:00' and timestamp @t1;
 }
 
 drop table t1;
@@ -128,6 +128,7 @@ select * from t1 for system_time all;
 
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
 select * from t1 for system_time as of now() for update;
 
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
@@ -165,7 +166,7 @@ insert into t1 values (1);
 insert into t2 values (2);
 select * from (select * from t1 cross join t2) as tmp;
 select * from (select * from (select * from t1 cross join t2) as tmp1) as tmp2;
-select * from (select * from t1 cross join t2 for system_time as of timestamp ('0-0-0')) as tmp;
+select * from (select * from t1 cross join t2 for system_time as of timestamp ('1970-01-01 00:00')) as tmp;
 
 create or replace table t1(a1 int) with system versioning;
 create or replace table t2(a2 int) with system versioning;
diff --git a/mysql-test/suite/versioning/t/sysvars.test b/mysql-test/suite/versioning/t/sysvars.test
index e82a116f30e..ef5d97ad262 100644
--- a/mysql-test/suite/versioning/t/sysvars.test
+++ b/mysql-test/suite/versioning/t/sysvars.test
@@ -97,8 +97,8 @@ select * from t for system_time all;
 select * from t;
 select * from t for system_time as of timestamp current_timestamp(6);
 select * from t for system_time all;
-select * from t for system_time from '0-0-0' to current_timestamp(6);
-select * from t for system_time between '0-0-0' and current_timestamp(6);
+select * from t for system_time from '1970-01-01 00:00' to current_timestamp(6);
+select * from t for system_time between '1970-01-01 00:00' and current_timestamp(6);
 
 show status like "Feature_system_versioning";
 
diff --git a/mysql-test/suite/versioning/t/view.test b/mysql-test/suite/versioning/t/view.test
index 288f1eb6e21..37676a7fb50 100644
--- a/mysql-test/suite/versioning/t/view.test
+++ b/mysql-test/suite/versioning/t/view.test
@@ -65,7 +65,7 @@ insert into t1 values (1);
 insert into t2 values (2);
 create or replace view vt12 as select * from t1 cross join t2;
 select * from vt12;
-create or replace view vt12 as select * from t1 for system_time as of timestamp ('0-0-0') cross join t2;
+create or replace view vt12 as select * from t1 for system_time as of timestamp ('1970-01-01 00:00') cross join t2;
 select * from vt12;
 
 --echo # VIEW improvements [tempesta-tech/mariadb#183]