diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 09:40:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 09:40:29 +0200 |
| commit | 06988bdcaa2d1af2c178c199b7f65dbafda45a2c (patch) | |
| tree | e94f851b10a83bfde159fd3adf692352cfe9cdf3 /mysql-test/suite/versioning | |
| parent | 662fe08232d807f06da9665fa5a288717407f735 (diff) | |
| parent | ba4f8e317de33330c882b5de14979685a0216ce0 (diff) | |
| download | mariadb-git-06988bdcaa2d1af2c178c199b7f65dbafda45a2c.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/versioning')
| -rw-r--r-- | mysql-test/suite/versioning/r/create.result | 25 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/partition.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/t/create.test | 17 |
3 files changed, 43 insertions, 2 deletions
diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result index 1017db78a4b..cd0551abf98 100644 --- a/mysql-test/suite/versioning/r/create.result +++ b/mysql-test/suite/versioning/r/create.result @@ -611,3 +611,28 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`id`) ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING drop table t1; +# +# MDEV-26928 Column-inclusive WITH SYSTEM VERSIONING doesn't work with explicit system fields +# +create or replace table t1 (x int, y int with system versioning); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `x` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, + `y` int(11) DEFAULT NULL +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +create or replace table t1 ( +x int, y int with system versioning, +row_start timestamp(6) as row start, +row_end timestamp(6) as row end, +period for system_time(row_start, row_end)); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `x` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, + `y` int(11) DEFAULT NULL, + `row_start` timestamp(6) GENERATED ALWAYS AS ROW START WITHOUT SYSTEM VERSIONING, + `row_end` timestamp(6) GENERATED ALWAYS AS ROW END WITHOUT SYSTEM VERSIONING, + PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`) +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +drop table t1; diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index 87af899b1b3..c8d95ac0063 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -998,8 +998,7 @@ delete from t1; delete from t1; check table t1; Table Op Msg_type Msg_text -test.t1 check note Not supported for non-INTERVAL history partitions -test.t1 check note The storage engine for the table doesn't support check +test.t1 check status OK drop table t1; # # MDEV-21233 Assertion `m_extra_cache' failed in ha_partition::late_extra_cache diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test index abd82998dc5..f79d38d029b 100644 --- a/mysql-test/suite/versioning/t/create.test +++ b/mysql-test/suite/versioning/t/create.test @@ -454,3 +454,20 @@ show index from t1; --replace_result $default_engine DEFAULT_ENGINE show create table t1; drop table t1; + +--echo # +--echo # MDEV-26928 Column-inclusive WITH SYSTEM VERSIONING doesn't work with explicit system fields +--echo # +create or replace table t1 (x int, y int with system versioning); +--replace_result $default_engine DEFAULT_ENGINE +show create table t1; + +create or replace table t1 ( + x int, y int with system versioning, + row_start timestamp(6) as row start, + row_end timestamp(6) as row end, + period for system_time(row_start, row_end)); +--replace_result $default_engine DEFAULT_ENGINE +show create table t1; + +drop table t1; |