Commit 3a438cf5 authored by bar@mysql.com/bar.myoffice.izhnet.ru's avatar bar@mysql.com/bar.myoffice.izhnet.ru
Browse files

Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column 

Problem: some collation handlers called incorrect version
of my_like_range_xxx(), which led to wrong min_str and max_str,
so like range optimizer threw away good records.
Fix: changing the wrong handlers to call proper version of
my_like_range_xxx().
parent afe8ac31

mysql-test/include/ctype_like_range_f1f2.inc

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#

# Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column

#

# Testing my_ctype_like_range_xxx

# (used in LIKE optimization for an indexed column)

#



# Create table using @@character_set_connection and @@collation_connection

# for the string columns.



CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);



INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));



# Check pattern (important for ucs2, utf16, utf32)

SELECT hex(concat(repeat(0xF1F2, 10), '%'));



--echo 3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

DROP TABLE t1;

mysql-test/r/ctype_big5.result

+34 −0
Original line number Diff line number Diff line
@@ -120,6 +120,23 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; 
c2h

ab_def

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

SET collation_connection='big5_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -170,6 +187,23 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; 
c2h

ab_def

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

SET NAMES big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('');

mysql-test/r/ctype_cp932.result

+34 −0
Original line number Diff line number Diff line
@@ -11325,6 +11325,23 @@ cp932_japanese_ci 6109 
cp932_japanese_ci	61

cp932_japanese_ci	6120

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

SET collation_connection='cp932_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -11335,6 +11352,23 @@ cp932_bin 6109 
cp932_bin	61

cp932_bin	6120

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

create table t2 (a char(1));

insert into t2 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7');

insert into t2 values ('8'),('9'),('A'),('B'),('C'),('D'),('E'),('F');

mysql-test/r/ctype_eucjpms.result

+34 −0
Original line number Diff line number Diff line
@@ -9809,6 +9809,23 @@ eucjpms_japanese_ci 6109 
eucjpms_japanese_ci	61

eucjpms_japanese_ci	6120

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

SET collation_connection='eucjpms_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -9819,6 +9836,23 @@ eucjpms_bin 6109 
eucjpms_bin	61

eucjpms_bin	6120

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

select hex(convert(_eucjpms 0xA5FE41 using ucs2));

hex(convert(_eucjpms 0xA5FE41 using ucs2))

003F0041

mysql-test/r/ctype_euckr.result

+34 −0
Original line number Diff line number Diff line
@@ -120,6 +120,23 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; 
c2h

ab_def

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

SET collation_connection='euckr_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -170,6 +187,23 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; 
c2h

ab_def

drop table t1;

CREATE TABLE t1 AS

SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;

ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);

INSERT INTO t1 (a, b) VALUES (1, repeat(0xF1F2,5));

INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));

INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));

INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));

SELECT hex(concat(repeat(0xF1F2, 10), '%'));

hex(concat(repeat(0xF1F2, 10), '%'))

F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F225

3 rows expected

SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');

a	hex(b)	c

2	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	

DROP TABLE t1;

SET NAMES euckr;

CREATE TABLE t1 (a text) character set euckr;

INSERT INTO t1 VALUES (0xA2E6),(0xFEF7);