diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
| commit | 1813d92d0c505a1c752f4a9d6e37db6bffe4efdd (patch) | |
| tree | f570314890197949ae55cbbad3a94eb5893c4177 /mysql-test/suite/versioning | |
| parent | 0fe97c20b341665058491fca4d665207406775c6 (diff) | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| download | mariadb-git-1813d92d0c505a1c752f4a9d6e37db6bffe4efdd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/versioning')
| -rw-r--r-- | mysql-test/suite/versioning/r/sysvars.result | 30 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/t/sysvars.test | 26 |
2 files changed, 56 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 diff --git a/mysql-test/suite/versioning/t/sysvars.test b/mysql-test/suite/versioning/t/sysvars.test index ef5d97ad262..7c5e818ec81 100644 --- a/mysql-test/suite/versioning/t/sysvars.test +++ b/mysql-test/suite/versioning/t/sysvars.test @@ -104,6 +104,30 @@ show status like "Feature_system_versioning"; drop table t; +--echo # +--echo # MDEV-22906 Disallow system_versioning_asof in DML +--echo # +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); + +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); + +replace t2 select x + 1 from t1; +select * from t2; + +insert t2 select x + 2 from t1; +select * from t2; + +drop tables t1, t2; + --echo # --echo # MDEV-16991 Rounding vs truncation for TIME, DATETIME, TIMESTAMP @@ -113,3 +137,5 @@ SET sql_mode=TIME_ROUND_FRACTIONAL; SET @@global.system_versioning_asof= timestamp'2001-12-31 23:59:59.9999999'; SELECT @@global.system_versioning_asof; SET @@global.system_versioning_asof= DEFAULT; + +--echo # End of 10.4 tests |