bzr commit into mysql-5.5-next-mr branch (bar:2910) Bug#37129

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-next-mr-b37129/ based on
revid:bar@stripped

 2910 Alexander Barkov	2009-10-29
      Backporting Bug#37129 LDML lacks <i> rule

    modified:
      mysql-test/r/ctype_ldml.result
      mysql-test/std_data/Index.xml
      mysql-test/t/ctype_ldml.test
      strings/ctype-uca.c
      strings/ctype.c
=== modified file 'mysql-test/r/ctype_ldml.result'
--- a/mysql-test/r/ctype_ldml.result	2009-10-21 10:48:22 +0000
+++ b/mysql-test/r/ctype_ldml.result	2009-10-29 13:07:10 +0000
@@ -1,8 +1,40 @@
 drop table if exists t1;
+In the following tests we change the order of letter "b"
+making it equal to letter "a", and check that it works
+with all Unicode character sets
 set names utf8;
 show variables like 'character_sets_dir%';
 Variable_name	Value
 character_sets_dir	MYSQL_TEST_DIR/std_data/
+show collation like 'utf8_phone_ci';
+Collation	Charset	Id	Default	Compiled	Sortlen
+utf8_phone_ci	utf8	352			8
+CREATE TABLE t1 (
+name VARCHAR(64),
+phone VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_phone_ci
+);
+INSERT INTO t1 VALUES ('Svoj','[phone]');
+INSERT INTO t1 VALUES ('Hf','[phone]');
+INSERT INTO t1 VALUES ('Bar','[phone]');
+INSERT INTO t1 VALUES ('Ramil','(7912) 800 80 03');
+INSERT INTO t1 VALUES ('Sanja','[phone]');
+SELECT * FROM t1 ORDER BY phone;
+name	phone
+Sanja	[phone]
+Bar	[phone]
+Svoj	[phone]
+Ramil	(7912) 800 80 03
+Hf	[phone]
+SELECT * FROM t1 WHERE phone='[phone]';
+name	phone
+Bar	[phone]
+SELECT * FROM t1 WHERE phone='79128008001';
+name	phone
+Bar	[phone]
+SELECT * FROM t1 WHERE phone='7 9 1 2 8 0 0 8 0 0 1';
+name	phone
+Bar	[phone]
+DROP TABLE t1;
 show collation like 'utf8_test_ci';
 Collation	Charset	Id	Default	Compiled	Sortlen
 utf8_test_ci	utf8	353			8
@@ -333,6 +365,7 @@ select "foo" = "foo " collate latin1_tes
 The following tests check that two-byte collation IDs work
 select * from information_schema.collations where id>256 order by id;
 COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
+utf8_phone_ci	utf8	352			8
 utf8_test_ci	utf8	353			8
 ucs2_test_ci	ucs2	358			8
 ucs2_vn_ci	ucs2	359			8

=== modified file 'mysql-test/std_data/Index.xml'
--- a/mysql-test/std_data/Index.xml	2009-10-21 10:48:22 +0000
+++ b/mysql-test/std_data/Index.xml	2009-10-29 13:07:10 +0000
@@ -1,10 +1,20 @@
 <charsets>
 
   <charset name="utf8">
+    <collation name="utf8_phone_ci" id="352">
+      <rules>
+        <reset>\u0000</reset>
+          <i>\u0020</i> <!-- space -->
+          <i>\u0028</i> <!-- left parenthesis -->
+          <i>\u0029</i> <!-- right parenthesis -->
+          <i>\u002B</i> <!-- plus -->
+          <i>\u002D</i> <!-- hyphen -->
+      </rules>
+    </collation>
     <collation name="utf8_test_ci" id="353">
       <rules>
         <reset>a</reset>
-        <s>b</s>
+        <i>b</i>
       </rules>
     </collation>
 

=== modified file 'mysql-test/t/ctype_ldml.test'
--- a/mysql-test/t/ctype_ldml.test	2009-10-21 10:48:22 +0000
+++ b/mysql-test/t/ctype_ldml.test	2009-10-29 13:07:10 +0000
@@ -4,11 +4,30 @@
 drop table if exists t1;
 --enable_warnings
 
+--echo In the following tests we change the order of letter "b"
+--echo making it equal to letter "a", and check that it works
+--echo with all Unicode character sets
 set names utf8;
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 show variables like 'character_sets_dir%';
 
+show collation like 'utf8_phone_ci';
+CREATE TABLE t1 (
+ name VARCHAR(64),
+ phone VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_phone_ci
+);
+INSERT INTO t1 VALUES ('Svoj','[phone]');
+INSERT INTO t1 VALUES ('Hf','[phone]');
+INSERT INTO t1 VALUES ('Bar','[phone]');
+INSERT INTO t1 VALUES ('Ramil','(7912) 800 80 03');
+INSERT INTO t1 VALUES ('Sanja','[phone]');
+SELECT * FROM t1 ORDER BY phone;
+SELECT * FROM t1 WHERE phone='[phone]';
+SELECT * FROM t1 WHERE phone='79128008001';
+SELECT * FROM t1 WHERE phone='7 9 1 2 8 0 0 8 0 0 1';
+DROP TABLE t1;
+
 show collation like 'utf8_test_ci';
 create table t1 (c1 char(1) character set utf8 collate utf8_test_ci);
 insert into t1 values ('a');

=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2009-10-06 10:34:49 +0000
+++ b/strings/ctype-uca.c	2009-10-29 13:07:10 +0000
@@ -7661,6 +7661,13 @@ static my_coll_lexem_num my_coll_lexem_n
       goto ex;
     }
     
+    if (beg[0] == '=')
+    {
+      beg++;
+      rc= MY_COLL_LEXEM_DIFF;
+      goto ex;
+    }
+    
     if (beg[0] == '<')
     {
       for (beg++, lexem->diff= 1;
@@ -7821,6 +7828,10 @@ static int my_coll_rule_parse(MY_COLL_RU
           item.diff[1]= 0;
           item.diff[2]= 0;
         }
+        else if (lexem.diff == 0)
+        {
+          item.diff[0]= item.diff[1]= item.diff[2]= 0;
+        }
         if (nitems >= mitems)
         {
           my_coll_lexem_print_error(&lexem,errstr,errsize-1,"Too many rules");

=== modified file 'strings/ctype.c'
--- a/strings/ctype.c	2009-09-30 05:09:28 +0000
+++ b/strings/ctype.c	2009-10-29 13:07:10 +0000
@@ -74,6 +74,7 @@ struct my_cs_file_section_st
 #define	_CS_DIFF1	19
 #define	_CS_DIFF2	20
 #define	_CS_DIFF3	21
+#define	_CS_IDENTICAL	22
 
 
 static struct my_cs_file_section_st sec[] =
@@ -108,6 +109,7 @@ static struct my_cs_file_section_st sec[
   {_CS_DIFF1,		"charsets/charset/collation/rules/p"},
   {_CS_DIFF2,		"charsets/charset/collation/rules/s"},
   {_CS_DIFF3,		"charsets/charset/collation/rules/t"},
+  {_CS_IDENTICAL,	"charsets/charset/collation/rules/i"},
   {0,	NULL}
 };
 
@@ -269,6 +271,7 @@ static int cs_value(MY_XML_PARSER *st,co
   case _CS_DIFF1:
   case _CS_DIFF2:
   case _CS_DIFF3:
+  case _CS_IDENTICAL:
     {
       /*
         Convert collation description from
@@ -276,7 +279,7 @@ static int cs_value(MY_XML_PARSER *st,co
         into ICU Collation Customization expression.
       */
       char arg[16];
-      const char *cmd[]= {"&","<","<<","<<<"};
+      const char *cmd[]= {"&","<","<<","<<<","="};
       i->cs.tailoring= i->tailoring;
       mstr(arg,attr,len,sizeof(arg)-1);
       if (i->tailoring_length + 20 < sizeof(i->tailoring))


Attachment: [text/bzr-bundle] bzr/[e-mail]