database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/mysql-4.1-opt

Browse Source 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  SCCS merged
This commit is contained in:
unknown
2006-06-22 20:48:49 -07:00
parent 596102c9be d62551af39
commit d0412ab8e0
2 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mysql-test/r/ctype_utf8.result
View File

@ -1225,6 +1225,62 @@ a
Käli Käli 2-4 Käli Käli 2-4
Käli Käli 2-4 Käli Käli 2-4
DROP TABLE t1; DROP TABLE t1;
SET NAMES latin2;
CREATE TABLE t1 (
id int(11) NOT NULL default '0',
tid int(11) NOT NULL default '0',
val text NOT NULL,
INDEX idx(tid, val(10))
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO t1 VALUES
(40988,72,'VOLN<4C> ADSL'),(41009,72,'VOLN<4C> ADSL'),
(41032,72,'VOLN<4C> ADSL'),(41038,72,'VOLN<4C> ADSL'),
(41063,72,'VOLN<4C> ADSL'),(41537,72,'VOLN<4C> ADSL Office'),
(42141,72,'VOLN<4C> ADSL'),(42565,72,'VOLN<4C> ADSL Combi'),
(42749,72,'VOLN<4C> ADSL'),(44205,72,'VOLN<4C> ADSL');
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLNY ADSL';
id tid val
40988 72 VOLN<4C> ADSL
41009 72 VOLN<4C> ADSL
41032 72 VOLN<4C> ADSL
41038 72 VOLN<4C> ADSL
41063 72 VOLN<4C> ADSL
42141 72 VOLN<4C> ADSL
42749 72 VOLN<4C> ADSL
44205 72 VOLN<4C> ADSL
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN<4C> ADSL';
id tid val
40988 72 VOLN<4C> ADSL
41009 72 VOLN<4C> ADSL
41032 72 VOLN<4C> ADSL
41038 72 VOLN<4C> ADSL
41063 72 VOLN<4C> ADSL
42141 72 VOLN<4C> ADSL
42749 72 VOLN<4C> ADSL
44205 72 VOLN<4C> ADSL
SELECT * FROM t1 WHERE tid=72 and val LIKE '%VOLN<4C> ADSL';
id tid val
40988 72 VOLN<4C> ADSL
41009 72 VOLN<4C> ADSL
41032 72 VOLN<4C> ADSL
41038 72 VOLN<4C> ADSL
41063 72 VOLN<4C> ADSL
42141 72 VOLN<4C> ADSL
42749 72 VOLN<4C> ADSL
44205 72 VOLN<4C> ADSL
ALTER TABLE t1 DROP KEY idx;
ALTER TABLE t1 ADD KEY idx (tid,val(11));
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN<4C> ADSL';
id tid val
40988 72 VOLN<4C> ADSL
41009 72 VOLN<4C> ADSL
41032 72 VOLN<4C> ADSL
41038 72 VOLN<4C> ADSL
41063 72 VOLN<4C> ADSL
42141 72 VOLN<4C> ADSL
42749 72 VOLN<4C> ADSL
44205 72 VOLN<4C> ADSL
DROP TABLE t1;
CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8; CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa'); INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
SELECT id FROM t1; SELECT id FROM t1;

31
mysql-test/t/ctype_utf8.test
View File

@ -995,6 +995,37 @@ ALTER TABLE t1 ADD KEY (a(10));
SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%'; SELECT * FROM t1 WHERE a LIKE 'Käli Käli 2%';
DROP TABLE t1; DROP TABLE t1;
#
# Bug#18359: LIKE predicate for a 'utf8' text column with a partial index
# (see bug #16674 as well)
#
SET NAMES latin2;
CREATE TABLE t1 (
id int(11) NOT NULL default '0',
tid int(11) NOT NULL default '0',
val text NOT NULL,
INDEX idx(tid, val(10))
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO t1 VALUES
(40988,72,'VOLN<4C> ADSL'),(41009,72,'VOLN<4C> ADSL'),
(41032,72,'VOLN<4C> ADSL'),(41038,72,'VOLN<4C> ADSL'),
(41063,72,'VOLN<4C> ADSL'),(41537,72,'VOLN<4C> ADSL Office'),
(42141,72,'VOLN<4C> ADSL'),(42565,72,'VOLN<4C> ADSL Combi'),
(42749,72,'VOLN<4C> ADSL'),(44205,72,'VOLN<4C> ADSL');
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLNY ADSL';
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN<4C> ADSL';
SELECT * FROM t1 WHERE tid=72 and val LIKE '%VOLN<4C> ADSL';
ALTER TABLE t1 DROP KEY idx;
ALTER TABLE t1 ADD KEY idx (tid,val(11));
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN<4C> ADSL';
DROP TABLE t1;
# End of 4.1 tests # End of 4.1 tests
# #