Commit fcb7576f authored by unknown's avatar unknown
Browse files

After merge fix. 


mysql-test/r/lowercase_table.result:
  Adjusting to 5.1: DEFAULT is now printed in upper case.
mysql-test/t/rpl_ignore_table.test:
  After merge fix
parent 33dfb4ea

mysql-test/r/lowercase_table.result

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ create table İ (s1 int); 
show create table İ;

Table	Create Table

İ	CREATE TABLE `i` (

  `s1` int(11) default NULL

  `s1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show tables;

Tables_in_test
@@ -100,7 +100,7 @@ create table İİ (s1 int); 
show create table İİ;

Table	Create Table

İİ	CREATE TABLE `ii` (

  `s1` int(11) default NULL

  `s1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show tables;

Tables_in_test

mysql-test/t/rpl_ignore_table.test

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ sync_slave_with_master; 
# bug#22877 replication character sets get out of sync

# using replicate-wild-ignore-table

#

connection master;

--disable_warnings

DROP TABLE IF EXISTS t5;

--enable_warnings
@@ -50,3 +51,4 @@ SELECT HEX(word) FROM t5; 
SELECT * FROM tmptbl504451f4258$1;

connection master;

DROP TABLE t5;

sync_slave_with_master;