diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-08-15 12:04:51 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-08-15 12:04:51 +0500 |
| commit | 0cd51b1afdc8c6192614af62925a2bcd73287a7f (patch) | |
| tree | aeff9e2e373ebb32e7adf91af53fe67a5c23bda7 | |
| parent | 131f9a71d101db6551176cf7dff0528395fa751a (diff) | |
| parent | ef6019010da0a55f018e7f37a8d191236d9202ca (diff) | |
| download | mariadb-git-0cd51b1afdc8c6192614af62925a2bcd73287a7f.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b19741
into mysql.com:/usr/home/bar/mysql-5.0.b19741merge
strings/ctype-win1250ch.c:
Coding style fix
| -rw-r--r-- | mysql-test/r/ctype_cp1250_ch.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/ctype_cp1250_ch.test | 10 | ||||
| -rw-r--r-- | strings/ctype-win1250ch.c | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/r/ctype_cp1250_ch.result index 533bfb8cb53..b55849e4e12 100644 --- a/mysql-test/r/ctype_cp1250_ch.result +++ b/mysql-test/r/ctype_cp1250_ch.result @@ -42,3 +42,11 @@ id str 6 aaaaaa 7 aaaaaaa 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; diff --git a/mysql-test/t/ctype_cp1250_ch.test b/mysql-test/t/ctype_cp1250_ch.test index 2d1e5f0bf9d..65550e0c193 100644 --- a/mysql-test/t/ctype_cp1250_ch.test +++ b/mysql-test/t/ctype_cp1250_ch.test @@ -44,4 +44,14 @@ INSERT INTO t1 VALUES (NULL, 'aaaaaaa'); select * from t1 where str like 'aa%'; 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 diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c index 0bc465f16ea..39948964a42 100644 --- a/strings/ctype-win1250ch.c +++ b/strings/ctype-win1250ch.c @@ -636,11 +636,11 @@ my_like_range_win1250ch(CHARSET_INFO *cs __attribute__((unused)), ptr++; /* Skip escape */ else if (*ptr == w_one || *ptr == w_many) /* '_' or '%' in SQL */ 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) only_min_found= 0; 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) |