diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
| commit | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch) | |
| tree | 652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/galera_3nodes | |
| parent | b73c70c265cab9bae2fd5c243b484172bec0a91d (diff) | |
| parent | 789f55c947a8aa224e5b0a71d5c0bea375320091 (diff) | |
| download | mariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/galera_3nodes')
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result b/mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result index 776c54aebe1..69d5a3dcc0e 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result +++ b/mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result @@ -20,7 +20,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci LOCK TABLE t1 WRITE; UNLOCK TABLES; FLUSH TABLES WITH READ LOCK; diff --git a/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result b/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result index deef311b1e4..62c3924d92c 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result +++ b/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result @@ -14,7 +14,7 @@ wsrep_cluster CREATE TABLE `wsrep_cluster` ( `protocol_version` int(11) NOT NULL, `capabilities` int(11) NOT NULL, PRIMARY KEY (`cluster_uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0 SHOW CREATE TABLE mysql.wsrep_cluster_members; Table Create Table wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( @@ -23,7 +23,7 @@ wsrep_cluster_members CREATE TABLE `wsrep_cluster_members` ( `node_name` char(32) NOT NULL, `node_incoming_address` varchar(256) NOT NULL, PRIMARY KEY (`node_uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0 SELECT COUNT(*) AS EXPECT_1 FROM mysql.wsrep_cluster; EXPECT_1 1 |