diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2021-09-27 15:53:52 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-10-26 17:07:46 +0200 |
| commit | 7da721be314c7355a549681dc93a782f89c99981 (patch) | |
| tree | 3a1ed3eeaab621cd674e87d6d55a3ec44d46e467 /mysql-test/suite/atomic | |
| parent | 428024524cc8979b55c510f3d4685eb86767bfda (diff) | |
| download | mariadb-git-7da721be314c7355a549681dc93a782f89c99981.tar.gz | |
Review and crash-safety fix
Diffstat (limited to 'mysql-test/suite/atomic')
| -rw-r--r-- | mysql-test/suite/atomic/alter_partition,innodb.rdiff | 38 | ||||
| -rw-r--r-- | mysql-test/suite/atomic/alter_partition.result | 54 | ||||
| -rw-r--r-- | mysql-test/suite/atomic/alter_partition.test | 8 |
3 files changed, 97 insertions, 3 deletions
diff --git a/mysql-test/suite/atomic/alter_partition,innodb.rdiff b/mysql-test/suite/atomic/alter_partition,innodb.rdiff index f11c1ef833c..3b4d51a3833 100644 --- a/mysql-test/suite/atomic/alter_partition,innodb.rdiff +++ b/mysql-test/suite/atomic/alter_partition,innodb.rdiff @@ -195,3 +195,41 @@ master-bin.000001 # Query # # use `test`; ALTER TABLE t1 CONVERT PARTITION p1 TO TABLE tp1 Table Create Table t1 CREATE TABLE `t1` ( +@@ -270,15 +234,12 @@ + x + 12 + # CRASH: crash_convert_partition_10 +-t1#P#p0.MYD +-t1#P#p0.MYI +-t1#P#pn.MYD +-t1#P#pn.MYI ++t1#P#p0.ibd ++t1#P#pn.ibd + t1.frm + t1.par +-tp1.MYD +-tp1.MYI + tp1.frm ++tp1.ibd + master-bin.000001 # Query # # use `test`; ALTER TABLE t1 CONVERT PARTITION p1 TO TABLE tp1 + Table Create Table + t1 CREATE TABLE `t1` ( +@@ -297,15 +258,12 @@ + x + 12 + # CRASH: crash_convert_partition_11 +-t1#P#p0.MYD +-t1#P#p0.MYI +-t1#P#pn.MYD +-t1#P#pn.MYI ++t1#P#p0.ibd ++t1#P#pn.ibd + t1.frm + t1.par +-tp1.MYD +-tp1.MYI + tp1.frm ++tp1.ibd + master-bin.000001 # Query # # use `test`; ALTER TABLE t1 CONVERT PARTITION p1 TO TABLE tp1 + Table Create Table + t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/atomic/alter_partition.result b/mysql-test/suite/atomic/alter_partition.result index ab4bc80af51..d9055f14aa8 100644 --- a/mysql-test/suite/atomic/alter_partition.result +++ b/mysql-test/suite/atomic/alter_partition.result @@ -269,5 +269,59 @@ tp1 CREATE TABLE `tp1` ( ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING x 12 +# CRASH: crash_convert_partition_10 +t1#P#p0.MYD +t1#P#p0.MYI +t1#P#pn.MYD +t1#P#pn.MYI +t1.frm +t1.par +tp1.MYD +tp1.MYI +tp1.frm +master-bin.000001 # Query # # use `test`; ALTER TABLE t1 CONVERT PARTITION p1 TO TABLE tp1 +Table Create Table +t1 CREATE TABLE `t1` ( + `x` int(11) DEFAULT NULL +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING + PARTITION BY RANGE (`x`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = DEFAULT_ENGINE, + PARTITION `pn` VALUES LESS THAN MAXVALUE ENGINE = DEFAULT_ENGINE) +x +2 +22 +Table Create Table +tp1 CREATE TABLE `tp1` ( + `x` int(11) DEFAULT NULL +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +x +12 +# CRASH: crash_convert_partition_11 +t1#P#p0.MYD +t1#P#p0.MYI +t1#P#pn.MYD +t1#P#pn.MYI +t1.frm +t1.par +tp1.MYD +tp1.MYI +tp1.frm +master-bin.000001 # Query # # use `test`; ALTER TABLE t1 CONVERT PARTITION p1 TO TABLE tp1 +Table Create Table +t1 CREATE TABLE `t1` ( + `x` int(11) DEFAULT NULL +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING + PARTITION BY RANGE (`x`) +(PARTITION `p0` VALUES LESS THAN (10) ENGINE = DEFAULT_ENGINE, + PARTITION `pn` VALUES LESS THAN MAXVALUE ENGINE = DEFAULT_ENGINE) +x +2 +22 +Table Create Table +tp1 CREATE TABLE `tp1` ( + `x` int(11) DEFAULT NULL +) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING +x +12 Warnings: Note 1051 Unknown table 'test.t1' diff --git a/mysql-test/suite/atomic/alter_partition.test b/mysql-test/suite/atomic/alter_partition.test index f4f1c75ed81..2606c328146 100644 --- a/mysql-test/suite/atomic/alter_partition.test +++ b/mysql-test/suite/atomic/alter_partition.test @@ -36,7 +36,7 @@ if ($MTR_COMBINATION_ROW) let $MYSQLD_DATADIR= `SELECT @@datadir`; -let $crash_count= 12; +let $crash_count= 14; let $crash_points='crash_create_before_create_frm', 'crash_alter_partition_after_create_frm', 'crash_alter_partition_after_write_frm', @@ -48,10 +48,12 @@ let $crash_points='crash_create_before_create_frm', 'crash_convert_partition_6', 'crash_convert_partition_7', 'crash_convert_partition_8', - 'crash_convert_partition_9'; + 'crash_convert_partition_9', + 'crash_convert_partition_10', + 'crash_convert_partition_11'; #let $crash_count= 1; -#let $crash_points= 'crash_convert_partition_8'; +#let $crash_points= 'crash_convert_partition_10'; let $statement_count= 1; let $statements= 'ALTER TABLE t1 CONVERT PARTITION p1 TO TABLE tp1'; |