diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-11-03 13:08:53 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-11-03 13:08:53 +0400 |
| commit | fcb7576f42994a353b0a5937b4d1c1b97333ea26 (patch) | |
| tree | 4995c8d5c5b1bee2932e88da83e752136619d738 | |
| parent | 33dfb4ea39fa9d56f90c976f1dcf1fd711513c9f (diff) | |
| download | mariadb-git-fcb7576f42994a353b0a5937b4d1c1b97333ea26.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/lowercase_table.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_ignore_table.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/r/lowercase_table.result index 6df3cf61ddb..464f423fa92 100644 --- a/mysql-test/r/lowercase_table.result +++ b/mysql-test/r/lowercase_table.result @@ -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 diff --git a/mysql-test/t/rpl_ignore_table.test b/mysql-test/t/rpl_ignore_table.test index 31191b9c386..10c75db0b70 100644 --- a/mysql-test/t/rpl_ignore_table.test +++ b/mysql-test/t/rpl_ignore_table.test @@ -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; |