bk commit into 5.1 tree (cmiller:1.2399)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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-29 12:49:21-05:00, cmiller@stripped +3 -0
  Fix merges.

  mysql-test/r/func_misc.result@stripped, 2006-11-28 15:05:47-05:00,
cmiller@stripped +1 -1
    case change in SHOW CREATE keywords.

  mysql-test/r/mysql.result@stripped, 2006-11-28 15:05:47-05:00, cmiller@stripped +7
-7
    Revert clobber of charset special chars.

  mysql-test/t/mysql.test@stripped, 2006-11-28 15:05:47-05:00, cmiller@stripped +4
-4
    Revert clobber of charset special chars.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint

--- 1.28/mysql-test/r/func_misc.result	2006-11-29 12:49:26 -05:00
+++ 1.29/mysql-test/r/func_misc.result	2006-11-29 12:49:26 -05:00
@@ -138,7 +138,7 @@ create table t1 select INET_ATON('255.25
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` bigint(21) unsigned default NULL
+  `a` bigint(21) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 End of 5.0 tests

--- 1.29/mysql-test/r/mysql.result	2006-11-29 12:49:26 -05:00
+++ 1.30/mysql-test/r/mysql.result	2006-11-29 12:49:26 -05:00
@@ -61,16 +61,16 @@ database()
 test
 unlock tables;
 drop table t1;
-ƒ\
-ƒ\
+ƒ\
+ƒ\
 c_cp932
-ƒ\
-ƒ\
-ƒ\
+ƒ\
+ƒ\
+ƒ\
 ソ
 ソ
-ƒ\
-ƒ\
+ƒ\
+ƒ\
 +----------------------+------------+--------+
 | concat('>',col1,'<') | col2       | col3   |
 +----------------------+------------+--------+

--- 1.29/mysql-test/t/mysql.test	2006-11-29 12:49:26 -05:00
+++ 1.30/mysql-test/t/mysql.test	2006-11-29 12:49:26 -05:00
@@ -52,10 +52,10 @@ drop table t1;
 --exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"
 
 # its usage to switch internally in mysql to requested charset
---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'; create
table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ƒ\'); select * from
t1;  drop table t1;"
---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'"
---exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set
character_set_client= cp932; select 'ƒ\'"
---exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set
character_set_client= cp932; select 'ƒ\'"
+--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'; create
table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ƒ\'); select * from
t1;  drop table t1;"
+--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'"
+--exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set
character_set_client= cp932; select 'ƒ\'"
+--exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set
character_set_client= cp932; select 'ƒ\'"
 
 #
 # Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string".