diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 09:07:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 09:07:40 +0300 |
| commit | c9a85fb1b14d9944920ebdb3514c48ea57e1647d (patch) | |
| tree | 922d11920b800072a90ebfba68ce23640500fb84 /mysql-test/suite/innodb/t/innodb-alter.test | |
| parent | 068246c006b8f691982194529a32bff7eb010694 (diff) | |
| parent | 773a07b65517327add6348c045cee14bdf489fe0 (diff) | |
| download | mariadb-git-c9a85fb1b14d9944920ebdb3514c48ea57e1647d.tar.gz | |
Merge 10.2 into 10.3
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 df2cd1707dc..e0ee5a04ac4 100644 --- a/mysql-test/suite/innodb/t/innodb-alter.test +++ b/mysql-test/suite/innodb/t/innodb-alter.test @@ -652,10 +652,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; |