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/binlog | |
| 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/binlog')
4 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result index da48f4b2641..5a8278e898c 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result @@ -107,7 +107,7 @@ CREATE TABLE t1 (c29 DATETIME); INSERT INTO t1 VALUES ('2001-02-03 10:20:30'); DELETE FROM t1 WHERE c29='2001-02-03 10:20:30'; DROP TABLE t1; -CREATE TABLE t1 (c30 TIMESTAMP); +CREATE TABLE t1 (c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP); INSERT INTO t1 VALUES ('2001-02-03 10:20:30'); DELETE FROM t1 WHERE c30='2001-02-03 10:20:30'; DROP TABLE t1; @@ -1675,7 +1675,7 @@ DROP TABLE `t1` /* generated by server */ # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; -CREATE TABLE t1 (c30 TIMESTAMP) +CREATE TABLE t1 (c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-98 diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index a5e4d39eb5f..76be60fba18 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -50,7 +50,7 @@ c27 DECIMAL ZEROFILL, # c28 DATE, c29 DATETIME, -c30 TIMESTAMP, +c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c31 TIME, c32 YEAR, # @@ -2306,7 +2306,7 @@ c27 DECIMAL ZEROFILL, # c28 DATE, c29 DATETIME, -c30 TIMESTAMP, +c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c31 TIME, c32 YEAR, # diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index 43c6d9c51b7..72184c4a4f5 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -50,7 +50,7 @@ c27 DECIMAL ZEROFILL, # c28 DATE, c29 DATETIME, -c30 TIMESTAMP, +c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c31 TIME, c32 YEAR, # @@ -2306,7 +2306,7 @@ c27 DECIMAL ZEROFILL, # c28 DATE, c29 DATETIME, -c30 TIMESTAMP, +c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c31 TIME, c32 YEAR, # diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test index 9609a9af384..0c94d968338 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test @@ -142,7 +142,7 @@ INSERT INTO t1 VALUES ('2001-02-03 10:20:30'); DELETE FROM t1 WHERE c29='2001-02-03 10:20:30'; DROP TABLE t1; -CREATE TABLE t1 (c30 TIMESTAMP); +CREATE TABLE t1 (c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP); INSERT INTO t1 VALUES ('2001-02-03 10:20:30'); DELETE FROM t1 WHERE c30='2001-02-03 10:20:30'; DROP TABLE t1; |