-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch '5.5' into 10.0
- Loading branch information
Showing
31 changed files
with
420 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
--echo # | ||
--echo # MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine | ||
--echo # | ||
|
||
--eval CREATE TABLE t1 (i INT) ENGINE=$engine PARTITION BY LIST(i) (PARTITION p0 VALUES IN (1), PARTITION p1 VALUES IN (2)); | ||
ALTER TABLE t1 ROW_FORMAT=COMPRESSED; | ||
ALTER TABLE t1 DROP PARTITION p1; | ||
SELECT * FROM t1; | ||
|
||
# Cleanup | ||
DROP TABLE t1; | ||
|
||
|
||
--echo # | ||
--echo # MDEV-13788 Server crash when issuing bad SQL partition syntax | ||
--echo # | ||
|
||
--eval CREATE TABLE t1 (id int, d date) ENGINE=$engine PARTITION BY RANGE COLUMNS(d) (PARTITION p1 VALUES LESS THAN (MAXVALUE)) | ||
SHOW CREATE TABLE t1; | ||
--error ER_PARTITION_REQUIRES_VALUES_ERROR | ||
ALTER TABLE t1 REORGANIZE PARTITION p1 INTO | ||
( | ||
PARTITION p2, /* Notice no values */ | ||
PARTITION p3 VALUES LESS THAN (MAXVALUE) | ||
); | ||
DROP TABLE t1; | ||
|
||
|
||
--eval CREATE TABLE t1 (id int, d date) ENGINE=$engine PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1,2,3)) | ||
SHOW CREATE TABLE t1; | ||
--error ER_PARTITION_REQUIRES_VALUES_ERROR | ||
ALTER TABLE t1 REORGANIZE PARTITION p1 INTO | ||
( | ||
PARTITION p2, /* Notice no values */ | ||
PARTITION p3 VALUES IN (4,5,6) | ||
); | ||
DROP TABLE t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# | ||
# MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine | ||
# | ||
CREATE TABLE t1 (i INT) ENGINE=InnoDB PARTITION BY LIST(i) (PARTITION p0 VALUES IN (1), PARTITION p1 VALUES IN (2));; | ||
ALTER TABLE t1 ROW_FORMAT=COMPRESSED; | ||
Warnings: | ||
Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. | ||
Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT. | ||
Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. | ||
Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT. | ||
ALTER TABLE t1 DROP PARTITION p1; | ||
SELECT * FROM t1; | ||
i | ||
DROP TABLE t1; | ||
# | ||
# MDEV-13788 Server crash when issuing bad SQL partition syntax | ||
# | ||
CREATE TABLE t1 (id int, d date) ENGINE=InnoDB PARTITION BY RANGE COLUMNS(d) (PARTITION p1 VALUES LESS THAN (MAXVALUE)); | ||
SHOW CREATE TABLE t1; | ||
Table Create Table | ||
t1 CREATE TABLE `t1` ( | ||
`id` int(11) DEFAULT NULL, | ||
`d` date DEFAULT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 | ||
/*!50500 PARTITION BY RANGE COLUMNS(d) | ||
(PARTITION p1 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB) */ | ||
ALTER TABLE t1 REORGANIZE PARTITION p1 INTO | ||
( | ||
PARTITION p2, /* Notice no values */ | ||
PARTITION p3 VALUES LESS THAN (MAXVALUE) | ||
); | ||
ERROR HY000: Syntax error: RANGE PARTITIONING requires definition of VALUES LESS THAN for each partition | ||
DROP TABLE t1; | ||
CREATE TABLE t1 (id int, d date) ENGINE=InnoDB PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1,2,3)); | ||
SHOW CREATE TABLE t1; | ||
Table Create Table | ||
t1 CREATE TABLE `t1` ( | ||
`id` int(11) DEFAULT NULL, | ||
`d` date DEFAULT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 | ||
/*!50100 PARTITION BY LIST (id) | ||
(PARTITION p1 VALUES IN (1,2,3) ENGINE = InnoDB) */ | ||
ALTER TABLE t1 REORGANIZE PARTITION p1 INTO | ||
( | ||
PARTITION p2, /* Notice no values */ | ||
PARTITION p3 VALUES IN (4,5,6) | ||
); | ||
ERROR HY000: Syntax error: LIST PARTITIONING requires definition of VALUES IN for each partition | ||
DROP TABLE t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,44 @@ | ||
CREATE TABLE t1 (i INT) ENGINE=MYISAM | ||
PARTITION BY LIST(i) ( | ||
PARTITION p0 VALUES IN (1), | ||
PARTITION p1 VALUES IN (2) | ||
); | ||
# | ||
# MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine | ||
# | ||
CREATE TABLE t1 (i INT) ENGINE=MyISAM PARTITION BY LIST(i) (PARTITION p0 VALUES IN (1), PARTITION p1 VALUES IN (2));; | ||
ALTER TABLE t1 ROW_FORMAT=COMPRESSED; | ||
ALTER TABLE t1 DROP PARTITION p1; | ||
SELECT * FROM t1; | ||
i | ||
DROP TABLE t1; | ||
# | ||
# MDEV-13788 Server crash when issuing bad SQL partition syntax | ||
# | ||
CREATE TABLE t1 (id int, d date) ENGINE=MyISAM PARTITION BY RANGE COLUMNS(d) (PARTITION p1 VALUES LESS THAN (MAXVALUE)); | ||
SHOW CREATE TABLE t1; | ||
Table Create Table | ||
t1 CREATE TABLE `t1` ( | ||
`id` int(11) DEFAULT NULL, | ||
`d` date DEFAULT NULL | ||
) ENGINE=MyISAM DEFAULT CHARSET=latin1 | ||
/*!50500 PARTITION BY RANGE COLUMNS(d) | ||
(PARTITION p1 VALUES LESS THAN (MAXVALUE) ENGINE = MyISAM) */ | ||
ALTER TABLE t1 REORGANIZE PARTITION p1 INTO | ||
( | ||
PARTITION p2, /* Notice no values */ | ||
PARTITION p3 VALUES LESS THAN (MAXVALUE) | ||
); | ||
ERROR HY000: Syntax error: RANGE PARTITIONING requires definition of VALUES LESS THAN for each partition | ||
DROP TABLE t1; | ||
CREATE TABLE t1 (id int, d date) ENGINE=MyISAM PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1,2,3)); | ||
SHOW CREATE TABLE t1; | ||
Table Create Table | ||
t1 CREATE TABLE `t1` ( | ||
`id` int(11) DEFAULT NULL, | ||
`d` date DEFAULT NULL | ||
) ENGINE=MyISAM DEFAULT CHARSET=latin1 | ||
/*!50100 PARTITION BY LIST (id) | ||
(PARTITION p1 VALUES IN (1,2,3) ENGINE = MyISAM) */ | ||
ALTER TABLE t1 REORGANIZE PARTITION p1 INTO | ||
( | ||
PARTITION p2, /* Notice no values */ | ||
PARTITION p3 VALUES IN (4,5,6) | ||
); | ||
ERROR HY000: Syntax error: LIST PARTITIONING requires definition of VALUES IN for each partition | ||
DROP TABLE t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
--source include/have_innodb.inc | ||
--source include/have_partition.inc | ||
--let $engine=InnoDB | ||
--source inc/part_alter_values.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,3 @@ | ||
# | ||
# MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine | ||
# | ||
|
||
--source include/have_partition.inc | ||
|
||
CREATE TABLE t1 (i INT) ENGINE=MYISAM | ||
PARTITION BY LIST(i) ( | ||
PARTITION p0 VALUES IN (1), | ||
PARTITION p1 VALUES IN (2) | ||
); | ||
ALTER TABLE t1 ROW_FORMAT=COMPRESSED; | ||
ALTER TABLE t1 DROP PARTITION p1; | ||
SELECT * FROM t1; | ||
|
||
# Cleanup | ||
DROP TABLE t1; | ||
--let $engine=MyISAM | ||
--source inc/part_alter_values.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.