bzr commit into mysql-6.0 branch (bar:2830) WL#4164

[Alexander Barkov]

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

 2830 Alexander Barkov	2008-09-11
      Post-fix for WL#4164 Two-byte collation IDs
      User defined collation ID range is decided to be 1024..2047.
      - Changing array size accordingly
      - Adding test for collation ID 2047.
modified:
  include/my_sys.h
  mysql-test/r/ctype_ldml.result
  mysql-test/std_data/Index.xml

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2008-08-24 16:12:12 +0000
+++ b/include/my_sys.h	2008-09-11 03:31:09 +0000
@@ -233,7 +233,7 @@ extern uint    my_large_page_size;
 #endif
 
 /* charsets */
-#define MY_ALL_CHARSETS_SIZE 512
+#define MY_ALL_CHARSETS_SIZE 2048
 extern CHARSET_INFO *default_charset_info;
 extern CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
 extern CHARSET_INFO compiled_charsets[];

=== modified file 'mysql-test/r/ctype_ldml.result'
--- a/mysql-test/r/ctype_ldml.result	2008-07-24 11:33:35 +0000
+++ b/mysql-test/r/ctype_ldml.result	2008-09-11 03:31:09 +0000
@@ -324,6 +324,7 @@ utf8_test_ci	utf8	353			8
 ucs2_test_ci	ucs2	358			8
 ucs2_vn_ci	ucs2	359			8
 utf32_test_ci	utf32	391			8
+utf8_maxuserid_ci	utf8	2047			8
 show collation like '%test%';
 Collation	Charset	Id	Default	Compiled	Sortlen
 ucs2_test_ci	ucs2	358			8

=== modified file 'mysql-test/std_data/Index.xml'
--- a/mysql-test/std_data/Index.xml	2008-07-24 11:33:35 +0000
+++ b/mysql-test/std_data/Index.xml	2008-09-11 03:31:09 +0000
@@ -8,6 +8,12 @@
       </rules>
     </collation>
 
+    <collation name="utf8_maxuserid_ci" id="2047">
+      <rules>
+        <reset>a</reset>
+        <s>b</s>
+      </rules>
+    </collation>
   </charset>
 
   <charset name="utf16">