summaryrefslogtreecommitdiff
path: root/mysql-test/suite/versioning/r/sysvars.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-02 07:39:33 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-02 07:39:33 +0300
commitf347b3e0e6592329b1447fa460aca0a4b1f680b1 (patch)
treec671aced17dc9f6d0cc6c5a660b73b2e2dcfe841 /mysql-test/suite/versioning/r/sysvars.result
parentb0f836053b094b09999c102d10bf0ad6ed761ac6 (diff)
parent1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (diff)
downloadmariadb-git-f347b3e0e6592329b1447fa460aca0a4b1f680b1.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/versioning/r/sysvars.result')
-rw-r--r--mysql-test/suite/versioning/r/sysvars.result30
1 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/suite/versioning/r/sysvars.result b/mysql-test/suite/versioning/r/sysvars.result
index 93d99273a40..ac0a1237902 100644
--- a/mysql-test/suite/versioning/r/sysvars.result
+++ b/mysql-test/suite/versioning/r/sysvars.result
@@ -147,6 +147,35 @@ Variable_name Value
Feature_system_versioning 2
drop table t;
#
+# MDEV-22906 Disallow system_versioning_asof in DML
+#
+create or replace table t1 (x int) with system versioning;
+create or replace table t2 (y int);
+insert into t1 values (1);
+insert into t2 values (1);
+set system_versioning_asof= '1970-01-01 00:00:00';
+delete t1, t2 from t1 join t2 where t1.x = t2.y;
+select * from t1 for system_time as of timestamp now(6);
+x
+insert into t1 values (1);
+insert into t2 values (1);
+update t1, t2 set x= 2, y= 2 where x = y;
+select * from t1 for system_time as of timestamp now(6);
+x
+2
+replace t2 select x + 1 from t1;
+select * from t2;
+y
+2
+3
+insert t2 select x + 2 from t1;
+select * from t2;
+y
+2
+3
+4
+drop tables t1, t2;
+#
# MDEV-16991 Rounding vs truncation for TIME, DATETIME, TIMESTAMP
#
SET sql_mode=TIME_ROUND_FRACTIONAL;
@@ -157,3 +186,4 @@ SELECT @@global.system_versioning_asof;
@@global.system_versioning_asof
2002-01-01 00:00:00.000000
SET @@global.system_versioning_asof= DEFAULT;
+# End of 10.4 tests