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/funcs_1/include | |
| 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/funcs_1/include')
| -rw-r--r-- | mysql-test/suite/funcs_1/include/innodb_tb4.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/include/memory_tb4.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/include/myisam_tb4.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/funcs_1/include/innodb_tb4.inc b/mysql-test/suite/funcs_1/include/innodb_tb4.inc index 104b0e763be..b3e94fce80e 100644 --- a/mysql-test/suite/funcs_1/include/innodb_tb4.inc +++ b/mysql-test/suite/funcs_1/include/innodb_tb4.inc @@ -49,7 +49,7 @@ f217 float(53) unsigned zerofill, f218 date, f219 time, f220 datetime, -f221 timestamp, +f221 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, f222 year, f223 year(3), f224 year(4), diff --git a/mysql-test/suite/funcs_1/include/memory_tb4.inc b/mysql-test/suite/funcs_1/include/memory_tb4.inc index d3bab92af3d..3a4fc861f28 100644 --- a/mysql-test/suite/funcs_1/include/memory_tb4.inc +++ b/mysql-test/suite/funcs_1/include/memory_tb4.inc @@ -49,7 +49,7 @@ f217 float(53) unsigned zerofill, f218 date, f219 time, f220 datetime, -f221 timestamp, +f221 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, f222 year, f223 year(3), f224 year(4), diff --git a/mysql-test/suite/funcs_1/include/myisam_tb4.inc b/mysql-test/suite/funcs_1/include/myisam_tb4.inc index 23fa9af45bb..da934e6d658 100644 --- a/mysql-test/suite/funcs_1/include/myisam_tb4.inc +++ b/mysql-test/suite/funcs_1/include/myisam_tb4.inc @@ -49,7 +49,7 @@ f217 float(53) unsigned zerofill, f218 date, f219 time, f220 datetime, -f221 timestamp, +f221 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, f222 year, f223 year(3), f224 year(4), |