diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-15 13:56:04 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-15 13:56:04 +0200 |
| commit | e1af460146eda298ea403ec01f854aa4babea250 (patch) | |
| tree | 00aa2cc5aa55d1852663d30a5489be804c96b554 /mysql-test/suite/innodb/r/instant_alter.result | |
| parent | 2b921845ac5ba54da607e781e63d345be83b98b1 (diff) | |
| download | mariadb-git-e1af460146eda298ea403ec01f854aa4babea250.tar.gz | |
MDEV-18579 Assertion !ctx->online || num_fts_index == 0
instant_alter_column_possible(): Add the other MDEV-17459 work-around
condition. The existence of fulltext indexes only prevents instant
DROP COLUMN or changing the order of columns. Other forms of instant
ALTER TABLE are no problem.
Before commit 4e7ee166a9c76eb3546356aabfd2dbc759671cd0 that merged
the MDEV-18295 fix from 10.3, the work-around of MDEV-17459 in
instant_alter_column_possible() was categorically refusing any
ALGORITHM=INSTANT if any FULLTEXT INDEX was present. After that commit,
a related condition was only present in prepare_inplace_alter_table_dict()
but not in the other callers of instant_alter_column_possible().
Diffstat (limited to 'mysql-test/suite/innodb/r/instant_alter.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/instant_alter.result | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/instant_alter.result b/mysql-test/suite/innodb/r/instant_alter.result index f864221def5..f51da4df960 100644 --- a/mysql-test/suite/innodb/r/instant_alter.result +++ b/mysql-test/suite/innodb/r/instant_alter.result @@ -734,6 +734,9 @@ INSERT INTO t1 VALUES (1,1); ALTER TABLE t1 ADD COLUMN f INT AFTER a; ALTER TABLE t1 DROP b, DROP f; DROP TABLE t1; +CREATE TABLE t1(t TEXT NOT NULL, FULLTEXT(t)) ENGINE=InnoDB ROW_FORMAT=REDUNDANT; +ALTER TABLE t1 MODIFY COLUMN t TEXT; +DROP TABLE t1; CREATE TABLE t1 (id INT PRIMARY KEY, c2 INT UNIQUE, c3 POINT NOT NULL DEFAULT ST_GeomFromText('POINT(3 4)'), @@ -1414,6 +1417,9 @@ INSERT INTO t1 VALUES (1,1); ALTER TABLE t1 ADD COLUMN f INT AFTER a; ALTER TABLE t1 DROP b, DROP f; DROP TABLE t1; +CREATE TABLE t1(t TEXT NOT NULL, FULLTEXT(t)) ENGINE=InnoDB ROW_FORMAT=COMPACT; +ALTER TABLE t1 MODIFY COLUMN t TEXT; +DROP TABLE t1; CREATE TABLE t1 (id INT PRIMARY KEY, c2 INT UNIQUE, c3 POINT NOT NULL DEFAULT ST_GeomFromText('POINT(3 4)'), @@ -2094,10 +2100,13 @@ INSERT INTO t1 VALUES (1,1); ALTER TABLE t1 ADD COLUMN f INT AFTER a; ALTER TABLE t1 DROP b, DROP f; DROP TABLE t1; +CREATE TABLE t1(t TEXT NOT NULL, FULLTEXT(t)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC; +ALTER TABLE t1 MODIFY COLUMN t TEXT; +DROP TABLE t1; disconnect analyze; SELECT variable_value-@old_instant instants FROM information_schema.global_status WHERE variable_name = 'innodb_instant_alter_column'; instants -170 +171 SET GLOBAL innodb_purge_rseg_truncate_frequency= @saved_frequency; |