diff options
author | Alexander Barkov <bar@mariadb.org> | 2015-09-22 14:01:54 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2015-09-22 14:01:54 +0400 |
commit | 5c9c8ef1eac0a3868a57ed8fda8bda8cd2453b37 (patch) | |
tree | 88739fffdf78de796c665affa6beb8687ca25a2b /mysql-test/r/strict.result | |
parent | 89af0f11a83188cb2bfbfed0b54c00d718734995 (diff) | |
download | mariadb-git-5c9c8ef1eac0a3868a57ed8fda8bda8cd2453b37.tar.gz |
MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibility with MySQL
Diffstat (limited to 'mysql-test/r/strict.result')
-rw-r--r-- | mysql-test/r/strict.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 66a4225a710..9dcd5975411 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -1267,7 +1267,7 @@ d 2000-10-01 drop table t1; set @@sql_mode='traditional'; -create table t1(a int, b timestamp); +create table t1(a int, b timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP); alter table t1 add primary key(a); show create table t1; Table Create Table @@ -1277,7 +1277,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -create table t1(a int, b timestamp default 20050102030405); +create table t1(a int, b timestamp not null default 20050102030405); alter table t1 add primary key(a); show create table t1; Table Create Table |