diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:59:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:59:56 +0300 |
| commit | 5e996fbad9e2326a197731c594c11ade8a3c2492 (patch) | |
| tree | 3c3abfcd53f7d4abfe621f7cf97aa003a72f9d74 /mysql-test/suite/compat/maxdb | |
| parent | 5deccac4aaf1be948a0ae10f40bb5f668ac37a4d (diff) | |
| parent | a8e45404765db6bc6c57dab3cc834e92a44d0110 (diff) | |
| download | mariadb-git-5e996fbad9e2326a197731c594c11ade8a3c2492.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'mysql-test/suite/compat/maxdb')
| -rw-r--r-- | mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/compat/maxdb/type_timestamp.result | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result index e6181b6f6fa..727c79492ed 100644 --- a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result +++ b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result @@ -43,12 +43,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` timestamp NOT NULL DEFAULT current_timestamp() -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` timestamp NOT NULL DEFAULT current_timestamp() -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET sql_mode=MAXDB; SHOW CREATE TABLE t1; Table Create Table diff --git a/mysql-test/suite/compat/maxdb/type_timestamp.result b/mysql-test/suite/compat/maxdb/type_timestamp.result index b530c44ebf9..f6612ab18da 100644 --- a/mysql-test/suite/compat/maxdb/type_timestamp.result +++ b/mysql-test/suite/compat/maxdb/type_timestamp.result @@ -15,7 +15,7 @@ t1 CREATE TABLE `t1` ( `mdb_timestamp` timestamp NULL DEFAULT NULL, `ora_timestamp` timestamp NULL DEFAULT NULL, `max_timestamp` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET sql_mode=MAXDB; SHOW CREATE TABLE t1; Table Create Table @@ -49,5 +49,5 @@ t1 CREATE TABLE `t1` ( `mdb_timestamp` timestamp NULL DEFAULT NULL, `ora_timestamp` timestamp NULL DEFAULT NULL, `max_timestamp` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; |