Skip to content

Commit 8cca0f1

Browse files
committed
MDEV-37494: galera_3nodes.galera_vote_majority_dml - merge fix
Default charset and collation changes to utf8/uca1400 in 11.8 so this test result needs correcting.
1 parent ad07728 commit 8cca0f1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mysql-test/suite/galera_3nodes/r/galera_vote_majority_dml.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ t1 CREATE TABLE `t1` (
2929
`f1` int(11) NOT NULL,
3030
`f2` blob DEFAULT NULL,
3131
PRIMARY KEY (`f1`)
32-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
32+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
3333
SELECT * FROM t1;
3434
f1 f2
3535
2 a
@@ -41,7 +41,7 @@ t1 CREATE TABLE `t1` (
4141
`f1` int(11) NOT NULL,
4242
`f2` blob DEFAULT NULL,
4343
PRIMARY KEY (`f1`)
44-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
44+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
4545
SELECT * FROM t1;
4646
f1 f2
4747
2 a
@@ -53,7 +53,7 @@ t1 CREATE TABLE `t1` (
5353
`f1` int(11) NOT NULL,
5454
`f2` blob DEFAULT NULL,
5555
PRIMARY KEY (`f1`)
56-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
56+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
5757
SELECT * FROM t1;
5858
f1 f2
5959
2 a

0 commit comments

Comments
 (0)