diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 14:22:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 14:22:22 +0300 |
| commit | a42c80bd480c2060eca30101dab20ea6f6418bc8 (patch) | |
| tree | a0a7ab27e52c867637c51ac7126abea15cc4c049 /mysql-test/suite/innodb/t/innodb-alter.test | |
| parent | bcedb4200f26468d33f7064c1e6e126d81b21162 (diff) | |
| parent | baf0ef9a18fa69e97deb750d9fa545dd4f162596 (diff) | |
| download | mariadb-git-a42c80bd480c2060eca30101dab20ea6f6418bc8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-alter.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-alter.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test index 536bf4bff26..555a138b0dc 100644 --- a/mysql-test/suite/innodb/t/innodb-alter.test +++ b/mysql-test/suite/innodb/t/innodb-alter.test @@ -656,10 +656,13 @@ 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); --enable_info ALTER TABLE t1 ADD b DATE NOT NULL DEFAULT if(unix_timestamp()>1,TIMESTAMP'2001-01-01 10:20:30',0); --disable_info +SET GLOBAL innodb_instant_alter_column_allowed=@save_allowed; SELECT * FROM t1; DROP TABLE t1; |