From d577e3d4a8bd50a95d55a7696967cb7e756e26f8 Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.cornsilk.net" <>
Date: Wed, 29 Nov 2006 12:49:21 -0500
Subject: [PATCH] Fix merges.

---
 mysql-test/r/func_misc.result |  2 +-
 mysql-test/r/mysql.result     | 14 +++++++-------
 mysql-test/t/mysql.test       |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index cfea464dfd9..84974f845c5 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -138,7 +138,7 @@ create table t1 select INET_ATON('255.255.0.1') as `a`;
 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
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index cfcb3eaf334..3bba1944c52 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -61,16 +61,16 @@ database()
 test
 unlock tables;
 drop table t1;
-ﾂソ
-ﾂソ
+ソ
+ソ
 c_cp932
-ﾂソ
-ﾂソ
-ﾂソ
+ソ
+ソ
+ソ
 繧ｽ
 繧ｽ
-ﾂソ
-ﾂソ
+ソ
+ソ
 +----------------------+------------+--------+
 | concat('>',col1,'<') | col2       | col3   |
 +----------------------+------------+--------+
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 5f3f1140d4a..e21ecd3a790 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -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".