diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
| commit | a98c85bb501e9021c0d8d509b8c040611d4c0c3a (patch) | |
| tree | 61dc69fc1cbf886aee6c2934e8efc6b57c3462bb /mysql-test/t/alter_table.test | |
| parent | c18054deb2b5cfcf1f13aa71574406f2bafb87c6 (diff) | |
| parent | 7196691b44b65e12cb5cca6f17c8d0f091eb443f (diff) | |
| download | mariadb-git-a98c85bb501e9021c0d8d509b8c040611d4c0c3a.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'mysql-test/t/alter_table.test')
| -rw-r--r-- | mysql-test/t/alter_table.test | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index df4958bd2bc..eb395a72a22 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -1713,6 +1713,35 @@ ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS event_id (event_id,market_id); DROP TABLE t1; --echo # +--echo # MDEV-11126 Crash while altering persistent virtual column +--echo # + +CREATE TABLE `tab1` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `field2` set('option1','option2','option3','option4') NOT NULL, + `field3` set('option1','option2','option3','option4','option5') NOT NULL, + `field4` set('option1','option2','option3','option4') NOT NULL, + `field5` varchar(32) NOT NULL, + `field6` varchar(32) NOT NULL, + `field7` varchar(32) NOT NULL, + `field8` varchar(32) NOT NULL, + `field9` int(11) NOT NULL DEFAULT '1', + `field10` varchar(16) NOT NULL, + `field11` enum('option1','option2','option3') NOT NULL DEFAULT 'option1', + `v_col` varchar(128) AS (IF(field11='option1',CONCAT_WS(":","field1",field2,field3,field4,field5,field6,field7,field8,field9,field10), CONCAT_WS(":","field1",field11,field2,field3,field4,field5,field6,field7,field8,field9,field10))) PERSISTENT, + PRIMARY KEY (`id`) +) DEFAULT CHARSET=latin1; + +ALTER TABLE `tab1` CHANGE COLUMN v_col `v_col` varchar(128); +SHOW CREATE TABLE `tab1`; +ALTER TABLE `tab1` CHANGE COLUMN v_col `v_col` varchar(128) AS (IF(field11='option1',CONCAT_WS(":","field1",field2,field3,field4,field5,field6,field7,field8,field9,field10), CONCAT_WS(":","field1",field11,field2,field3,field4,field5,field6,field7,field8,field9,field10))) PERSISTENT; +SHOW CREATE TABLE `tab1`; +DROP TABLE `tab1`; +--echo # +--echo # Start of 10.1 tests +--echo # + +--echo # --echo # MDEV-7374 : Losing connection to MySQL while running ALTER TABLE --echo # CREATE TABLE t1(i INT) ENGINE=INNODB; @@ -1722,10 +1751,6 @@ ALTER TABLE t1 MODIFY i FLOAT; DROP TABLE t1; --echo # ---echo # Start of 10.1 tests ---echo # - ---echo # --echo # MDEV-7816 ALTER with DROP INDEX and ADD INDEX .. COMMENT='comment2' ignores the new comment --echo # CREATE TABLE t1(a INT); @@ -1733,4 +1758,3 @@ CREATE INDEX i1 ON t1(a) COMMENT 'comment1'; ALTER TABLE t1 DROP INDEX i1, ADD INDEX i1(a) COMMENT 'comment2'; SHOW CREATE TABLE t1; DROP TABLE t1; - |