bk commit into 5.0 tree (shuichi:1.1946) BUG#11717

[Shuichi Tamagawa]

Below is the list of changes that have just been committed into a local
5.0 repository of shuichi. When shuichi 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
  1.1946 05/07/18 13:38:56 shuichi@stripped +3 -0
  Fixed the ucs2 -> eucjpms conversion bug (bug#11717)

  strings/ctype-eucjpms.c
    1.10 05/07/18 13:24:47 shuichi@stripped +1 -1
    Fixed the ucs2 -> eucjpms conversion bug

  mysql-test/t/ctype_eucjpms.test
    1.8 05/07/18 13:24:46 shuichi@stripped +12 -0
    Added test for the bug#11717

  mysql-test/r/ctype_eucjpms.result
    1.5 05/07/18 13:24:46 shuichi@stripped +14 -0
    Added test for the bug#11717

# 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:	shuichi
# Host:	linux.mysql.com
# Root:	/home/shuichi/apps/mysql/bk/mysql-5.0

--- 1.4/mysql-test/r/ctype_eucjpms.result	2005-01-14 02:16:49 -08:00
+++ 1.5/mysql-test/r/ctype_eucjpms.result	2005-07-18 13:24:46 -07:00
@@ -9785,6 +9785,20 @@
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
+CREATE TABLE t1(c1 varchar(10)) default character set = eucjpms;
+insert into t1 values(_ucs2 0x00F7);
+insert into t1 values(_eucjpms 0xA1E0);
+insert into t1 values(_ujis 0xA1E0);
+insert into t1 values(_sjis 0x8180);
+insert into t1 values(_cp932 0x8180);
+SELECT HEX(c1) FROM t1;
+HEX(c1)
+A1E0
+A1E0
+A1E0
+A1E0
+A1E0
+DROP TABLE t1;
 SET collation_connection='eucjpms_japanese_ci';
 create table t1 select repeat('a',4000) a;
 delete from t1;

--- 1.7/mysql-test/t/ctype_eucjpms.test	2005-02-01 02:37:42 -08:00
+++ 1.8/mysql-test/t/ctype_eucjpms.test	2005-07-18 13:24:46 -07:00
@@ -346,6 +346,18 @@
 DROP TABLE t3;
 DROP TABLE t4;
 
+#Test bug#11717
+CREATE TABLE t1(c1 varchar(10)) default character set = eucjpms;
+
+insert into t1 values(_ucs2 0x00F7);
+insert into t1 values(_eucjpms 0xA1E0);
+insert into t1 values(_ujis 0xA1E0);
+insert into t1 values(_sjis 0x8180);
+insert into t1 values(_cp932 0x8180);
+
+SELECT HEX(c1) FROM t1;
+
+DROP TABLE t1;
 
 SET collation_connection='eucjpms_japanese_ci';
 -- source include/ctype_filesort.inc

--- 1.9/strings/ctype-eucjpms.c	2005-06-13 03:41:07 -07:00
+++ 1.10/strings/ctype-eucjpms.c	2005-07-18 13:24:47 -07:00
@@ -1584,7 +1584,7 @@
 
 /* page 3 0x00F7-0x00F7 */
 static uint16 tab_uni_jisx02083[]={
-0x07};
+0x2160};
 
 /* page 4 0x0391-0x03C9 */
 static uint16 tab_uni_jisx02084[]={