[Commits] Rev 3820: fix problem with collation by Bar in file:///home/bell/maria/bzr/work-maria-10.0-serg/

sanja at montyprogram.com sanja at montyprogram.com
Wed Aug 7 18:00:43 EEST 2013


At file:///home/bell/maria/bzr/work-maria-10.0-serg/

------------------------------------------------------------
revno: 3820
revision-id: sanja at montyprogram.com-20130807150043-rimv5sc15rd977j1
parent: sanja at montyprogram.com-20130807103958-14mevyjhq4cbkezx
committer: sanja at montyprogram.com
branch nick: work-maria-10.0-serg
timestamp: Wed 2013-08-07 18:00:43 +0300
message:
  fix problem with collation by Bar
-------------- next part --------------
=== modified file 'mysql-test/suite/innodb_fts/r/innodb_fts_misc.result'
--- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result	2013-08-07 15:00:43 +0000
@@ -659,16 +659,16 @@ Warnings:
 Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
 INSERT INTO t1 VALUES (1,'���������'),(2,'���������'),(3,'���������'),(4,'���������');
 DROP TABLE t1;
-"----------Test15---------"
-CREATE TABLE t1 (s1 VARCHAR (60) CHARACTER SET UTF8 COLLATE UTF8_UNICODE_520_CI) ENGINE = MyISAM;
+"----------Test15a--------"
+CREATE TABLE t1 (s1 VARCHAR (60) CHARACTER SET UTF8 COLLATE UTF8_UNICODE_CI) ENGINE = MyISAM;
 CREATE FULLTEXT INDEX i ON t1 (s1);
 INSERT INTO t1 VALUES
-('a'),('b'),('c'),('d'),('��������'),('LLLL'),(NULL),('�������� ��������'),('LLLLLLLL');
-SELECT * FROM t1 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI);
+('a'),('b'),('c'),('d'),('��������'),('OOOO'),(NULL),('�������� ��������'),('OOOOOOOO');
+SELECT * FROM t1 WHERE MATCH(s1) AGAINST ('OOOO' COLLATE UTF8_UNICODE_CI);
 s1
-��������
-LLLL
-�������� ��������
+��������
+OOOO
+�������� ��������
 DROP TABLE if EXISTS t2;
 Warnings:
 Note	1051	Unknown table 'test.t2'
@@ -677,10 +677,10 @@ CREATE FULLTEXT INDEX i ON t2 ( s1);
 Warnings:
 Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
 INSERT INTO t2 VALUES
-('a'),('b'),('c'),('d'),('��������'),('LLLL'),(NULL),('�������� ��������'),('LLLLLLLL');
-SELECT * FROM t2 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI);
+('a'),('b'),('c'),('d'),('��������'),('OOOO'),(NULL),('�������� ��������'),('OOOOOOOO');
+SELECT * FROM t2 WHERE MATCH(s1) AGAINST ('OOOO' COLLATE UTF8_UNICODE_CI);
 s1
-LLLL
+OOOO
 DROP TABLE t1,t2;
 "----------Test16---------"
 CREATE TABLE t1 (s1 INT, s2 VARCHAR(50) CHARACTER SET UTF8) ENGINE = InnoDB;

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_misc.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test	2013-08-07 10:39:58 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test	2013-08-07 15:00:43 +0000
@@ -2,7 +2,7 @@
 # Test With alter/create/drop index
 #------------------------------------------------------------------------------
 --source include/have_innodb.inc
-let collation=UTF8_UNICODE_520_CI;
+let collation=UTF8_UNICODE_CI;
 --source include/have_collation.inc
 
 --disable_warnings
@@ -600,18 +600,35 @@ INSERT INTO t1 VALUES (1,'���������'),(2
 DROP TABLE t1;
 
 
---echo "----------Test15---------"
-CREATE TABLE t1 (s1 VARCHAR (60) CHARACTER SET UTF8 COLLATE UTF8_UNICODE_520_CI) ENGINE = MyISAM;
+# TODO: uncomment this when utf8_unicode_520_ci is merged
+#--echo "----------Test15---------"
+#CREATE TABLE t1 (s1 VARCHAR (60) CHARACTER SET UTF8 COLLATE UTF8_UNICODE_520_CI) ENGINE = MyISAM;
+#CREATE FULLTEXT INDEX i ON t1 (s1);
+#INSERT INTO t1 VALUES
+#('a'),('b'),('c'),('d'),('��������'),('LLLL'),(NULL),('�������� ��������'),('LLLLLLLL');
+#SELECT * FROM t1 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI);
+#DROP TABLE if EXISTS t2;
+#CREATE TABLE t2 (s1 VARCHAR(60) CHARACTER SET UTF8 COLLATE UTF8_POLISH_CI) ENGINE = InnoDB;
+#CREATE FULLTEXT INDEX i ON t2 ( s1);
+#INSERT INTO t2 VALUES
+#('a'),('b'),('c'),('d'),('��������'),('LLLL'),(NULL),('�������� ��������'),('LLLLLLLL');
+#SELECT * FROM t2 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI);
+#--disable_warnings
+#DROP TABLE t1,t2;
+#--enable_warnings
+
+--echo "----------Test15a--------"
+CREATE TABLE t1 (s1 VARCHAR (60) CHARACTER SET UTF8 COLLATE UTF8_UNICODE_CI) ENGINE = MyISAM;
 CREATE FULLTEXT INDEX i ON t1 (s1);
 INSERT INTO t1 VALUES
-('a'),('b'),('c'),('d'),('��������'),('LLLL'),(NULL),('�������� ��������'),('LLLLLLLL');
-SELECT * FROM t1 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI);
+('a'),('b'),('c'),('d'),('��������'),('OOOO'),(NULL),('�������� ��������'),('OOOOOOOO');
+SELECT * FROM t1 WHERE MATCH(s1) AGAINST ('OOOO' COLLATE UTF8_UNICODE_CI);
 DROP TABLE if EXISTS t2;
 CREATE TABLE t2 (s1 VARCHAR(60) CHARACTER SET UTF8 COLLATE UTF8_POLISH_CI) ENGINE = InnoDB;
 CREATE FULLTEXT INDEX i ON t2 ( s1);
 INSERT INTO t2 VALUES
-('a'),('b'),('c'),('d'),('��������'),('LLLL'),(NULL),('�������� ��������'),('LLLLLLLL');
-SELECT * FROM t2 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI);
+('a'),('b'),('c'),('d'),('��������'),('OOOO'),(NULL),('�������� ��������'),('OOOOOOOO');
+SELECT * FROM t2 WHERE MATCH(s1) AGAINST ('OOOO' COLLATE UTF8_UNICODE_CI);
 --disable_warnings
 DROP TABLE t1,t2;
 --enable_warnings



More information about the commits mailing list