bk commit into 5.0 tree (bar:1.2517) BUG#29499

[bar]

Below is the list of changes that have just been committed into a local
5.0 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, 2007-07-04 12:04:57+05:00, bar@stripped +6 -0
  Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark'

  mysql-test/r/ctype_latin1.result@stripped, 2007-07-04 12:04:55+05:00, bar@stripped +4 -0
    Adding tests

  mysql-test/r/ctype_ucs.result@stripped, 2007-07-04 12:04:55+05:00, bar@stripped +10 -0
    Adding tests

  mysql-test/t/ctype_latin1.test@stripped, 2007-07-04 12:04:55+05:00, bar@stripped +7 -0
    Adding tests

  mysql-test/t/ctype_ucs.test@stripped, 2007-07-04 12:04:55+05:00, bar@stripped +10 -0
    Adding tests

  sql/share/charsets/ascii.xml@stripped, 2007-07-04 12:04:55+05:00, bar@stripped +1 -1
    Changing mapping of 0x7F from "unassigned" to U+007F.

  strings/ctype-extra.c@stripped, 2007-07-04 12:04:55+05:00, bar@stripped +2 -2
    Regenerating ctype-extra.c from new ascii.xml

diff -Nrup a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result
--- a/mysql-test/r/ctype_latin1.result	2006-04-06 10:51:17 +05:00
+++ b/mysql-test/r/ctype_latin1.result	2007-07-04 12:04:55 +05:00
@@ -391,3 +391,7 @@ ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
 SELECT convert(@str collate latin1_swedish_ci using utf8);
 convert(@str collate latin1_swedish_ci using utf8)
 ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+select hex(cast(_ascii 0x7f as char(1) character set latin1));
+hex(cast(_ascii 0x7f as char(1) character set latin1))
+7F
+End of 5.0 tests
diff -Nrup a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
--- a/mysql-test/r/ctype_ucs.result	2007-06-22 17:18:38 +05:00
+++ b/mysql-test/r/ctype_ucs.result	2007-07-04 12:04:55 +05:00
@@ -886,4 +886,14 @@ collation(group_concat(a separator ','))
 latin1_swedish_ci
 drop table t1;
 set names latin1;
+create table t1 (s1 char(1) character set ascii, s2 char(1) character set ucs2);
+insert into t1 (s1) values (0x7f);
+update t1 set s2 = s1;
+select hex(s2) from t1;
+hex(s2)
+007F
+select hex(convert(s1 using latin1)) from t1;
+hex(convert(s1 using latin1))
+7F
+drop table t1;
 End of 5.0 tests
diff -Nrup a/mysql-test/t/ctype_latin1.test b/mysql-test/t/ctype_latin1.test
--- a/mysql-test/t/ctype_latin1.test	2006-05-12 21:26:45 +05:00
+++ b/mysql-test/t/ctype_latin1.test	2007-07-04 12:04:55 +05:00
@@ -110,3 +110,10 @@ SELECT convert(@str collate latin1_germa
 SELECT convert(@str collate latin1_swedish_ci using utf8);
 
 # End of 4.1 tests
+
+#
+# Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark'
+#
+select hex(cast(_ascii 0x7f as char(1) character set latin1));
+
+--echo End of 5.0 tests
diff -Nrup a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
--- a/mysql-test/t/ctype_ucs.test	2007-06-22 17:18:38 +05:00
+++ b/mysql-test/t/ctype_ucs.test	2007-07-04 12:04:55 +05:00
@@ -612,4 +612,14 @@ select collation(group_concat(a separato
 drop table t1;
 set names latin1;
 
+#
+# Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark'
+#
+create table t1 (s1 char(1) character set ascii, s2 char(1) character set ucs2);
+insert into t1 (s1) values (0x7f);
+update t1 set s2 = s1;
+select hex(s2) from t1;
+select hex(convert(s1 using latin1)) from t1;
+drop table t1;
+
 --echo End of 5.0 tests
diff -Nrup a/sql/share/charsets/ascii.xml b/sql/share/charsets/ascii.xml
--- a/sql/share/charsets/ascii.xml	2006-12-23 23:04:28 +04:00
+++ b/sql/share/charsets/ascii.xml	2007-07-04 12:04:55 +05:00
@@ -97,7 +97,7 @@
 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 004A 004B 004C 004D 004E 004F
 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 005A 005B 005C 005D 005E 005F
 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 006A 006B 006C 006D 006E 006F
-0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 0000
+0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 007F
 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
diff -Nrup a/strings/ctype-extra.c b/strings/ctype-extra.c
--- a/strings/ctype-extra.c	2007-01-11 18:43:42 +04:00
+++ b/strings/ctype-extra.c	2007-07-04 12:04:55 +05:00
@@ -922,7 +922,7 @@ uint16 to_uni_ascii_general_ci[] = {
 0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
 0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
 0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x0000,
+0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
@@ -4603,7 +4603,7 @@ uint16 to_uni_ascii_bin[] = {
 0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
 0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
 0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x0000,
+0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,