mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/usr/home/bar/mysql-4.1.b19741

Browse source 
into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
This commit is contained in:
bar@mysql.com/bar.intranet.mysql.r18.ru 2006-08-15 12:04:51 +05:00
commit 9f6c76eb20
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/r/ctype_cp1250_ch.result
View file

@ -42,3 +42,11 @@ id str
6 aaaaaa 6 aaaaaa
7 aaaaaaa 7 aaaaaaa
drop table t1; drop table t1;
set names cp1250;
create table t1 (a varchar(15) collate cp1250_czech_cs NOT NULL, primary key(a));
insert into t1 values("abcdefghá");
insert into t1 values("ááèè");
select a from t1 where a like "abcdefghá";
a
abcdefghá
drop table t1;

10
mysql-test/t/ctype_cp1250_ch.test
View file

@ -44,4 +44,14 @@ INSERT INTO t1 VALUES (NULL, 'aaaaaaa');
select * from t1 where str like 'aa%'; select * from t1 where str like 'aa%';
drop table t1; drop table t1;
#
# Bug#19741 segfault with cp1250 charset + like + primary key + 64bit os
#
set names cp1250;
create table t1 (a varchar(15) collate cp1250_czech_cs NOT NULL, primary key(a));
insert into t1 values("abcdefghá");
insert into t1 values("ááèè");
select a from t1 where a like "abcdefghá";
drop table t1;
# End of 4.1 tests # End of 4.1 tests

4
strings/ctype-win1250ch.c
View file

@ -636,11 +636,11 @@ my_like_range_win1250ch(CHARSET_INFO *cs __attribute__((unused)),
ptr++; /* Skip escape */ ptr++; /* Skip escape */
else if (*ptr == w_one || *ptr == w_many) /* '_' or '%' in SQL */ else if (*ptr == w_one || *ptr == w_many) /* '_' or '%' in SQL */
break; break;
*min_str = like_range_prefix_min_win1250ch[(uint)(*ptr)]; *min_str= like_range_prefix_min_win1250ch[(uint) (uchar) (*ptr)];
if (*min_str != min_sort_char) if (*min_str != min_sort_char)
only_min_found= 0; only_min_found= 0;
min_str++; min_str++;
*max_str++= like_range_prefix_max_win1250ch[(uint)(*ptr)]; *max_str++= like_range_prefix_max_win1250ch[(uint) (uchar) (*ptr)];
} }
if (cs->state & MY_CS_BINSORT) if (cs->state & MY_CS_BINSORT)