From: Date: October 23 2008 1:48am Subject: svn commit - mysqldoc@docsrva: r12133 - in trunk: . refman-6.0 List-Archive: http://lists.mysql.com/commits/56852 Message-Id: <200810222348.m9MNmbRh009699@docsrva.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: paul Date: 2008-10-23 01:48:36 +0200 (Thu, 23 Oct 2008) New Revision: 12133 Log: r34925@frost: paul | 2008-10-22 18:50:11 -0500 Document the user-defined range of collation IDS for adding new collations (Final part of WL#4164) Modified: trunk/refman-6.0/internationalization.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34923 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695 + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34925 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695 Modified: trunk/refman-6.0/internationalization.xml =================================================================== --- trunk/refman-6.0/internationalization.xml 2008-10-22 23:15:09 UTC (rev 12132) +++ trunk/refman-6.0/internationalization.xml 2008-10-22 23:48:36 UTC (rev 12133) Changed blocks: 10, Lines Added: 30, Lines Deleted: 37; 5730 bytes @@ -7197,9 +7197,11 @@ - You must assign a unique ID number to each collation, chosen - from the range 1 to 254. To find the maximum of the currently - used collation IDs, use this query: + You must assign a unique ID number to each collation. As of + MySQL 6.0.8, the range of IDs from 1028 to 2047 is reserved + for user-defined collations. Before 6.0.8, the ID must be + chosen from the range 1 to 254. To find the maximum of the + currently used collation IDs, use this query: @@ -8146,9 +8148,11 @@ Each collation must have a unique ID. To add a new collation, - you must choose an ID value that is not currently used. The - value must be in the range from 1 to 254. The collation ID that - you choose will show up in these contexts: + you must choose an ID value that is not currently used. As of + MySQL 6.0.8, the range of IDs from 1028 to 2047 is reserved for + user-defined collations. Before 6.0.8, the ID must be chosen + from the range 1 to 254. The collation ID that you choose will + show up in these contexts: @@ -8201,11 +8205,6 @@ - For the output just shown, you could choose an ID higher than - 210 for the new collation. - - - To display a list of all currently used IDs, issue this statement: @@ -8232,20 +8231,14 @@ +-----+ - - In this case, you can either choose an unused ID from within the - current range of IDs, or choose an ID that is higher than the - current maximum ID. For example, in the output just shown, there - are unused IDs between 53 and 57, and between 99 and 128. Or you - could choose an ID higher than 210. - - - If you upgrade MySQL, you may find that the collation ID you - choose has been assigned to a collation included in the new - MySQL distribution. In this case, you will need to choose a - new value for your own collation. + Before MySQL 6.0.8, which provides for a range of user-defined + collation IDs, you must choose an ID in the range from 1 to + 254. In this case, if you upgrade MySQL, you may find that the + collation ID you choose has been assigned to a collation + included in the new MySQL distribution. In this case, you will + need to choose a new value for your own collation. @@ -8274,7 +8267,7 @@ Choose a collation ID, as shown in . The - following steps use an ID of 56. + following steps use an ID of 1028. @@ -8312,7 +8305,7 @@ <charset name="latin1"> ... <!-- associate collation name with its ID --> - <collation name="latin1_test_ci" id="56"/> + <collation name="latin1_test_ci" id="1028"/> ... </charset> @@ -8361,11 +8354,11 @@ mysql> SHOW COLLATION LIKE 'latin1_test_ci'; -+----------------+---------+----+---------+----------+---------+ -| Collation | Charset | Id | Default | Compiled | Sortlen | -+----------------+---------+----+---------+----------+---------+ -| latin1_test_ci | latin1 | 56 | | | 1 | -+----------------+---------+----+---------+----------+---------+ ++----------------+---------+------+---------+----------+---------+ +| Collation | Charset | Id | Default | Compiled | Sortlen | ++----------------+---------+------+---------+----------+---------+ +| latin1_test_ci | latin1 | 1028 | | | 1 | ++----------------+---------+------+---------+----------+---------+ @@ -8541,7 +8534,7 @@ Choose a collation ID, as shown in . The - following steps use an ID of 252. + following steps use an ID of 1029. @@ -8583,7 +8576,7 @@ <charset name="utf8"> ... <!-- associate collation name with its ID --> - <collation name="utf8_phone_ci" id="252"> + <collation name="utf8_phone_ci" id="1029"> <rules> <reset>\u0000</reset> <s>\u0020</s> <!-- space --> @@ -8618,11 +8611,11 @@ mysql> SHOW COLLATION LIKE 'utf8_phone_ci'; -+---------------+---------+-----+---------+----------+---------+ -| Collation | Charset | Id | Default | Compiled | Sortlen | -+---------------+---------+-----+---------+----------+---------+ -| utf8_phone_ci | utf8 | 252 | | | 8 | -+---------------+---------+-----+---------+----------+---------+ ++---------------+---------+------+---------+----------+---------+ +| Collation | Charset | Id | Default | Compiled | Sortlen | ++---------------+---------+------+---------+----------+---------+ +| utf8_phone_ci | utf8 | 1029 | | | 8 | ++---------------+---------+------+---------+----------+---------+