summaryrefslogtreecommitdiff
path: root/mysql-test/suite/federated
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2020-05-29 11:45:19 +0300
committerAleksey Midenkov <midenok@gmail.com>2020-05-29 11:45:19 +0300
commit57f7b4866f1347ebf3ee67fe61de3871e56e23cc (patch)
tree458e73627087c589987e3b13f57f9ee288c02e24 /mysql-test/suite/federated
parent278facee7c7a028d642f3b5f23a42bcf099d86f3 (diff)
downloadmariadb-git-57f7b4866f1347ebf3ee67fe61de3871e56e23cc.tar.gz
MDEV-16937 Strict SQL with system versioned tables causes issues (10.4)
Respect system fields in NO_ZERO_DATE mode. This is the subject for refactoring in MDEV-19597 Conflict resolution from 7d5223310789f967106d86ce193ef31b315ecff0
Diffstat (limited to 'mysql-test/suite/federated')
-rw-r--r--mysql-test/suite/federated/federatedx_versioning.result4
-rw-r--r--mysql-test/suite/federated/federatedx_versioning.test2
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/federated/federatedx_versioning.result b/mysql-test/suite/federated/federatedx_versioning.result
index abf2658d2e2..be3b578e839 100644
--- a/mysql-test/suite/federated/federatedx_versioning.result
+++ b/mysql-test/suite/federated/federatedx_versioning.result
@@ -9,8 +9,8 @@ show create table tf;
Table Create Table
tf CREATE TABLE `tf` (
`x` int(11) DEFAULT NULL,
- `row_start` SYS_TYPE NOT NULL INVISIBLE DEFAULT 0,
- `row_end` SYS_TYPE NOT NULL INVISIBLE DEFAULT 0
+ `row_start` SYS_TYPE INVISIBLE DEFAULT '1971-01-01 00:00:00.000000',
+ `row_end` SYS_TYPE INVISIBLE DEFAULT '1971-01-01 00:00:00.000000'
) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:MASTER_MYPORT/test/t1'
# INSERT
insert into t1 values (1);
diff --git a/mysql-test/suite/federated/federatedx_versioning.test b/mysql-test/suite/federated/federatedx_versioning.test
index e8db8ef9e2a..6c3247cea55 100644
--- a/mysql-test/suite/federated/federatedx_versioning.test
+++ b/mysql-test/suite/federated/federatedx_versioning.test
@@ -12,7 +12,7 @@ eval create or replace table t1 (
with system versioning;
--replace_result $MASTER_MYPORT MASTER_MYPORT
eval create or replace table tf engine=FEDERATED connection='mysql://root@127.0.0.1:$MASTER_MYPORT/test/t1';
---replace_result $MASTER_MYPORT MASTER_MYPORT $sys_datatype_expl SYS_TYPE "'0000-00-00 00:00:00.000000'" 0
+--replace_result $MASTER_MYPORT MASTER_MYPORT $sys_datatype_expl SYS_TYPE 19710101000000 "'1971-01-01 00:00:00.000000'" " NOT NULL" ""
show create table tf;
--echo # INSERT
insert into t1 values (1);