After merge fix.

parent 88034969
...@@ -90,7 +90,7 @@ create table İ (s1 int); ...@@ -90,7 +90,7 @@ create table İ (s1 int);
show create table İ; show create table İ;
Table Create Table Table Create Table
İ CREATE TABLE `i` ( İ CREATE TABLE `i` (
`s1` int(11) default NULL `s1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
show tables; show tables;
Tables_in_test Tables_in_test
...@@ -100,7 +100,7 @@ create table İİ (s1 int); ...@@ -100,7 +100,7 @@ create table İİ (s1 int);
show create table İİ; show create table İİ;
Table Create Table Table Create Table
İİ CREATE TABLE `ii` ( İİ CREATE TABLE `ii` (
`s1` int(11) default NULL `s1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
show tables; show tables;
Tables_in_test Tables_in_test
......
...@@ -33,6 +33,7 @@ sync_slave_with_master; ...@@ -33,6 +33,7 @@ sync_slave_with_master;
# bug#22877 replication character sets get out of sync # bug#22877 replication character sets get out of sync
# using replicate-wild-ignore-table # using replicate-wild-ignore-table
# #
connection master;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t5; DROP TABLE IF EXISTS t5;
--enable_warnings --enable_warnings
...@@ -50,3 +51,4 @@ SELECT HEX(word) FROM t5; ...@@ -50,3 +51,4 @@ SELECT HEX(word) FROM t5;
SELECT * FROM tmptbl504451f4258$1; SELECT * FROM tmptbl504451f4258$1;
connection master; connection master;
DROP TABLE t5; DROP TABLE t5;
sync_slave_with_master;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment