Commit 393179b6 authored by unknown's avatar unknown
Browse files

Merge dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj 

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-ndb-bj


mysql-test/r/ctype_cp1250_ch.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_cp1250_ch.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
parents fcee2eb3 c6cff9f1

mysql-test/r/ctype_cp1250_ch.result

+8 −0
Original line number Diff line number Diff line
@@ -43,3 +43,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;

mysql-test/t/ctype_cp1250_ch.test

+10 −0
Original line number Diff line number Diff line
@@ -47,4 +47,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

mysql-test/t/ctype_utf8.test

+14 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,20 @@ ALTER TABLE t1 ADD KEY idx (tid,val(11)); 
SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN ADSL'; 



DROP TABLE t1;



#

# Bug 20709: problem with utf8 fields in temporary tables

#



create table t1(a char(200) collate utf8_unicode_ci NOT NULL default '')

  default charset=utf8 collate=utf8_unicode_ci;

insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));

explain select distinct a from t1;

select distinct a from t1;

explain select a from t1 group by a;

select a from t1 group by a;

drop table t1;



# End of 4.1 tests



#