diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-05-04 23:28:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-05-04 23:28:45 +0200 |
| commit | 83fa03359f0359b666c074a5dde8ae87ad6bb515 (patch) | |
| tree | 7d544920428a303836645f10cb4725f99f589795 | |
| parent | 4a6fbe27b1ad1c7d937d8d1915a8c11e101bbd7d (diff) | |
| download | mariadb-git-83fa03359f0359b666c074a5dde8ae87ad6bb515.tar.gz | |
after merge: update the test for 10.10
because explicit_defaults_for_timestamp is now true
| -rw-r--r-- | mysql-test/main/insert_update.result | 3 | ||||
| -rw-r--r-- | 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 83344971c59..3cbc1944b5e 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 25953938ad1..bb56f04c532 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'); |