diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-02 11:48:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-02 11:48:51 +0300 |
| commit | c294443b41bff54eb11ac68f23b9366c0cb9ef90 (patch) | |
| tree | de182800e46ac22dbd6ac3ae510b12f6fcf94837 /mysql-test/suite/innodb/t/innodb-alter.test | |
| parent | fa8eb4de554152a673658fed7b3284c76009e208 (diff) | |
| parent | 05f7fd571fca15faecd898c5da8d98455e97c294 (diff) | |
| download | mariadb-git-c294443b41bff54eb11ac68f23b9366c0cb9ef90.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-alter.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-alter.test | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test index 7412212ceab..0bedbdc7bbb 100644 --- a/mysql-test/suite/innodb/t/innodb-alter.test +++ b/mysql-test/suite/innodb/t/innodb-alter.test @@ -652,13 +652,10 @@ DROP TABLE t1; # DATETIME-to-DATE truncation is OK CREATE TABLE t1 (a INT NOT NULL DEFAULT 0) ENGINE=InnoDB; -SET @save_allowed = @@GLOBAL.innodb_instant_alter_column_allowed; -SET GLOBAL innodb_instant_alter_column_allowed=never; -iNSERT INTO t1 VALUES (10); +INSERT INTO t1 VALUES (10); --enable_info -ALTER TABLE t1 ADD b DATE NOT NULL DEFAULT if(unix_timestamp()>1,TIMESTAMP'2001-01-01 10:20:30',0); +ALTER TABLE t1 ADD b DATE NOT NULL DEFAULT if(unix_timestamp()>1,TIMESTAMP'2001-01-01 10:20:30',0), algorithm=copy; --disable_info -SET GLOBAL innodb_instant_alter_column_allowed=@save_allowed; SELECT * FROM t1; DROP TABLE t1; |