summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_3innodb.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-09-22 14:01:54 +0400
committerAlexander Barkov <bar@mariadb.org>2015-09-22 14:01:54 +0400
commit5c9c8ef1eac0a3868a57ed8fda8bda8cd2453b37 (patch)
tree88739fffdf78de796c665affa6beb8687ca25a2b /mysql-test/r/ps_3innodb.result
parent89af0f11a83188cb2bfbfed0b54c00d718734995 (diff)
downloadmariadb-git-5c9c8ef1eac0a3868a57ed8fda8bda8cd2453b37.tar.gz
MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibility with MySQL
Diffstat (limited to 'mysql-test/r/ps_3innodb.result')
-rw-r--r--mysql-test/r/ps_3innodb.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index c9e7d042508..9d478acdccd 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -10,7 +10,8 @@ create table t9
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp, c16 time,
+c13 date, c14 datetime, c15 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
+ON UPDATE CURRENT_TIMESTAMP, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,