bk commit into 5.1 tree (bar:1.2330)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-03 13:08:53+04:00, bar@stripped +2 -0
  After merge fix.

  mysql-test/r/lowercase_table.result@stripped, 2006-11-03 13:08:49+04:00, bar@stripped +2 -2
    Adjusting to 5.1: DEFAULT is now printed in upper case.

  mysql-test/t/rpl_ignore_table.test@stripped, 2006-11-03 13:08:49+04:00, bar@stripped +2 -0
    After merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-rpl

--- 1.3/mysql-test/t/rpl_ignore_table.test	2006-11-03 13:09:04 +04:00
+++ 1.4/mysql-test/t/rpl_ignore_table.test	2006-11-03 13:09:04 +04:00
@@ -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;

--- 1.18/mysql-test/r/lowercase_table.result	2006-11-03 13:09:04 +04:00
+++ 1.19/mysql-test/r/lowercase_table.result	2006-11-03 13:09:04 +04:00
@@ -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