From 83fa03359f0359b666c074a5dde8ae87ad6bb515 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 4 May 2023 23:28:45 +0200 Subject: [PATCH] after merge: update the test for 10.10 because explicit_defaults_for_timestamp is now true --- mysql-test/main/insert_update.result | 3 ++- mysql-test/main/insert_update.test | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/insert_update.result b/mysql-test/main/insert_update.result index 83344971c5944..3cbc1944b5ef1 100644 --- a/mysql-test/main/insert_update.result +++ b/mysql-test/main/insert_update.result @@ -416,7 +416,8 @@ drop table t1; # MDEV-31164 default current_timestamp() not working when used INSERT ON DUPLICATE KEY in some cases # set timestamp=unix_timestamp('2000-10-20 0:0:0'); -create table t1 (pk integer primary key, val varchar(20) not null, ts timestamp); +create table t1 (pk integer primary key, val varchar(20) not null, ts timestamp +default current_timestamp on update current_timestamp); insert t1 (pk, val) values(1, 'val1'); select * from t1; pk val ts diff --git a/mysql-test/main/insert_update.test b/mysql-test/main/insert_update.test index 25953938ad142..bb56f04c53226 100644 --- a/mysql-test/main/insert_update.test +++ b/mysql-test/main/insert_update.test @@ -316,7 +316,8 @@ drop table t1; --echo # MDEV-31164 default current_timestamp() not working when used INSERT ON DUPLICATE KEY in some cases --echo # set timestamp=unix_timestamp('2000-10-20 0:0:0'); -create table t1 (pk integer primary key, val varchar(20) not null, ts timestamp); +create table t1 (pk integer primary key, val varchar(20) not null, ts timestamp + default current_timestamp on update current_timestamp); insert t1 (pk, val) values(1, 'val1'); select * from t1; set timestamp=unix_timestamp('2000-10-20 1:0:0');