bzr commit into mysql-6.0 branch (bar:2808) WL#1213

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-6.0-bugteam/

 2808 Alexander Barkov	2008-08-28
      Postfix for WL#1213  - Implement 4-byte UTF8, UTF16, UTF32
      - Fixing collation ID in have_utf8.require, which
        enables running of mistakenly disabled tests with "have_utf8".
      - Marking SJIS as ascii-incompatible, because U+005C (BACKSLASH)
        is converted to _sjis 0x815F, not to _sjis 0x5C and therefore
        quick 7-bit conversion is not possible.
        jp_convert_sjis from jp test suite failed without this change.
modified:
  mysql-test/r/have_utf8.require
  strings/ctype-sjis.c

=== modified file 'mysql-test/r/have_utf8.require'
--- a/mysql-test/r/have_utf8.require	2007-06-28 17:34:54 +0000
+++ b/mysql-test/r/have_utf8.require	2008-08-28 04:40:11 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-utf8_general_ci	utf8	33	Yes	Yes	1
+utf8_general_ci	utf8	45	Yes	Yes	1

=== modified file 'strings/ctype-sjis.c'
--- a/strings/ctype-sjis.c	2007-10-09 17:17:22 +0000
+++ b/strings/ctype-sjis.c	2008-08-28 04:40:11 +0000
@@ -4648,7 +4648,7 @@ static MY_CHARSET_HANDLER my_charset_han
 CHARSET_INFO my_charset_sjis_japanese_ci=
 {
     13,0,0,		/* number */
-    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_NONASCII,	/* state */
     "sjis",		/* cs name    */
     "sjis_japanese_ci",	/* name */
     "",			/* comment    */
@@ -4682,7 +4682,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci
 CHARSET_INFO my_charset_sjis_bin=
 {
     88,0,0,		/* number */
-    MY_CS_COMPILED|MY_CS_BINSORT,	/* state      */
+    MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NONASCII, /* state  */
     "sjis",		/* cs name    */
     "sjis_bin",		/* name */
     "",			/* comment    */