Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0

4 files changed, 15 insertions, 12 deletions

diff --git a/mysql-test/r/ctype_cp932.result b/mysql-test/r/ctype_cp932.result
index 833a5223b48..c5e57d996fd 100755
--- a/mysql-test/r/ctype_cp932.result
+++ b/mysql-test/r/ctype_cp932.result
@@ -8573,7 +8573,7 @@ F9F9
 F9FA
 F9FB
 F9FC
-CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;
+CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;
 SELECT HEX(c1) FROM t4;
 HEX(c1)
 05
diff --git a/mysql-test/r/ctype_eucjp_ms.result b/mysql-test/r/ctype_eucjpms.result
index 8684f626cde..f3c22a55a54 100755
--- a/mysql-test/r/ctype_eucjp_ms.result
+++ b/mysql-test/r/ctype_eucjpms.result
@@ -2,9 +2,9 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-set names eucjp_ms;
-set character_set_database = eucjp_ms;
-CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjp_ms;
+set names eucjpms;
+set character_set_database = eucjpms;
+CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjpms;
 INSERT INTO t1 VALUES
 (0x5C),(0x7E),(0xA1B1),(0xA1BD),(0xA1C0),(0xA1C1),(0xA1C2),(0xA1DD),(0xA1F1),(0xA1F2),(0xA1EF),(0xA2CC),(0x8FA2B7),(0x8FA2C3);
 INSERT INTO t1 VALUES
@@ -5045,7 +5045,7 @@ E754
 E755
 E756
 E757
-CREATE TABLE t3 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t2;
+CREATE TABLE t3 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t2;
 SELECT HEX(c1) FROM t3;
 HEX(c1)
 5C
@@ -9781,3 +9781,7 @@ F9F9
 F9FA
 F9FB
 F9FC
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/t/ctype_cp932.test
index d05f48a3c69..504468b1e1d 100755
--- a/mysql-test/t/ctype_cp932.test
+++ b/mysql-test/t/ctype_cp932.test
@@ -387,8 +387,8 @@ SELECT HEX(c1) FROM t2;
 CREATE TABLE t3 SELECT CONVERT(c1 USING cp932) AS c1 FROM t2;
 SELECT HEX(c1) FROM t3;
 
-#Test conversion to eucjp_ms
-CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;
+#Test conversion to eucjpms
+CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;
 SELECT HEX(c1) FROM t4;
 
 DROP TABLE t1;
diff --git a/mysql-test/t/ctype_eucjp_ms.test b/mysql-test/t/ctype_eucjpms.test
index 8706b5f7217..abc7105c12e 100755
--- a/mysql-test/t/ctype_eucjp_ms.test
+++ b/mysql-test/t/ctype_eucjpms.test
@@ -1,4 +1,3 @@
---character_set eucjp_ms
 --disable_warnings
 drop table if exists t1;
 drop table if exists t2;
@@ -6,10 +5,10 @@ drop table if exists t3;
 drop table if exists t4;
 --enable_warnings
 
-set names eucjp_ms;
-set character_set_database = eucjp_ms;
+set names eucjpms;
+set character_set_database = eucjpms;
  
-CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjp_ms;
+CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjpms;
 
 #Characters which are converted to Unicode ambiguously
 INSERT INTO t1 VALUES
@@ -332,7 +331,7 @@ CREATE TABLE t2 SELECT CONVERT(c1 USING ucs2) AS c1 FROM t1;
 SELECT HEX(c1) FROM t2;
 
 #Test round trip conversion
-CREATE TABLE t3 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t2;
+CREATE TABLE t3 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t2;
 SELECT HEX(c1) FROM t3;
 
 #Test conversion to cp932