summaryrefslogtreecommitdiff
path: root/mysql-test/suite/galera_sr
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-20 16:53:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-20 16:53:20 +0300
commit44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch)
tree13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/suite/galera_sr
parent5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff)
parent0792aff161132fb953510555fe45544991dec95d (diff)
downloadmariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/galera_sr')
-rw-r--r--mysql-test/suite/galera_sr/r/galera_sr_create_drop.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_create_drop.result b/mysql-test/suite/galera_sr/r/galera_sr_create_drop.result
index c8658f09ff0..5fa48e26edf 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_create_drop.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_create_drop.result
@@ -8,7 +8,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`f1` int(11) NOT NULL,
PRIMARY KEY (`f1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
connection node_1;
DROP TABLE t1;
connection node_2;