summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/r/rpl_gtid_until.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
commit7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch)
tree652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/rpl/r/rpl_gtid_until.result
parentb73c70c265cab9bae2fd5c243b484172bec0a91d (diff)
parent789f55c947a8aa224e5b0a71d5c0bea375320091 (diff)
downloadmariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_gtid_until.result')
-rw-r--r--mysql-test/suite/rpl/r/rpl_gtid_until.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_until.result b/mysql-test/suite/rpl/r/rpl_gtid_until.result
index 2295aad34ac..1032b8ddd5c 100644
--- a/mysql-test/suite/rpl/r/rpl_gtid_until.result
+++ b/mysql-test/suite/rpl/r/rpl_gtid_until.result
@@ -193,7 +193,7 @@ SHOW CREATE TABLE t3;
Table Create Table
t3 CREATE TABLE `t3` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
include/start_slave.inc
*** Test UNTIL condition that has not yet been logged. ***
connection server_2;