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/suite/vcol | |
| 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/suite/vcol')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index e68adf80073..5cd55af831b 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -183,7 +183,7 @@ a b c 0 1 y,n drop table t1,t2; CREATE TABLE t1 ( -ts TIMESTAMP, +ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, tsv TIMESTAMP AS (ADDDATE(ts, INTERVAL 1 DAY)) VIRTUAL ) ENGINE=MyISAM; INSERT INTO t1 (tsv) VALUES (DEFAULT); diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index 38f86702d70..717dd7775fa 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -183,7 +183,7 @@ drop table t1,t2; # CREATE TABLE t1 ( - ts TIMESTAMP, + ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, tsv TIMESTAMP AS (ADDDATE(ts, INTERVAL 1 DAY)) VIRTUAL ) ENGINE=MyISAM; |