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 /storage/test_sql_discovery | |
| 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 'storage/test_sql_discovery')
| -rw-r--r-- | storage/test_sql_discovery/mysql-test/sql_discovery/simple.result | 2 | ||||
| -rw-r--r-- | storage/test_sql_discovery/mysql-test/sql_discovery/simple.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result index ec87efea11c..94f3bd1ed87 100644 --- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result +++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result @@ -106,7 +106,7 @@ drop table t1; set @@test_sql_discovery_statement='t1: create table t1 ( a int not null default 5 primary key, - b timestamp, + b timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c tinyblob, d decimal(5,2), e varchar(30) character set ascii, diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test index 2b5364c9982..90eea753a38 100644 --- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test +++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test @@ -99,7 +99,7 @@ drop table t1; set @@test_sql_discovery_statement='t1: create table t1 ( a int not null default 5 primary key, - b timestamp, + b timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c tinyblob, d decimal(5,2), e varchar(30) character set ascii, |