Commit cd0ceaf8 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mdk10.(none):/home/reggie/bk/mysql-4.1
parents 81b82208 93b4fbea

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Miguel@light.local 
Sinisa@sinisa.nasamreza.org

WAX@sergbook.mysql.com

acurtis@pcgem.rdg.cyberkinetica.com

acurtis@xiphis.org

administrador@light.hegel.local

ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

akishkin@work.mysql.com

mysql-test/r/ctype_collate.result

+13 −0
Original line number Diff line number Diff line
@@ -535,6 +535,19 @@ s2 CHAR(5) COLLATE latin1_swedish_ci); 
SELECT * FROM t1 WHERE s1 = s2;

ERROR HY000: Illegal mix of collations (latin1_german1_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation '='

DROP TABLE t1;

CREATE TABLE t1

(s1 CHAR(5) COLLATE latin1_german1_ci,

s2 CHAR(5) COLLATE latin1_swedish_ci,

s3 CHAR(5) COLLATE latin1_bin);

INSERT INTO t1 VALUES ('a','A','A');

SELECT * FROM t1 WHERE s1 = s2;

ERROR HY000: Illegal mix of collations (latin1_german1_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation '='

SELECT * FROM t1 WHERE s1 = s3;

s1	s2	s3

SELECT * FROM t1 WHERE s2 = s3;

s1	s2	s3

a	A	A

DROP TABLE t1;

SET NAMES latin1;

CREATE TABLE t1 

(s1 char(10) COLLATE latin1_german1_ci,

mysql-test/r/query_cache.result

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ select UNIX_TIMESTAMP() from t1; 
UNIX_TIMESTAMP()

select USER() from t1;

USER()

select CURRENT_USER() from t1;

CURRENT_USER()

select benchmark(1,1) from t1;

benchmark(1,1)

explain extended select benchmark(1,1) from t1;

mysql-test/r/union.result

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ count(*) 
drop table t1;

create table t2 (

a char character set latin1 collate latin1_swedish_ci,

b char character set latin1 collate latin1_bin);

b char character set latin1 collate latin1_german1_ci);

create table t1 as

(select a from t2) union

(select b from t2);

mysql-test/t/ctype_collate.test

+12 −0
Original line number Diff line number Diff line
@@ -158,6 +158,18 @@ SELECT * FROM t1 WHERE s1 = s2; 
DROP TABLE t1;





CREATE TABLE t1

(s1 CHAR(5) COLLATE latin1_german1_ci,

 s2 CHAR(5) COLLATE latin1_swedish_ci,

 s3 CHAR(5) COLLATE latin1_bin);

INSERT INTO t1 VALUES ('a','A','A');

--error 1267

SELECT * FROM t1 WHERE s1 = s2;

SELECT * FROM t1 WHERE s1 = s3;

SELECT * FROM t1 WHERE s2 = s3;

DROP TABLE t1;





#

# Test that optimizer doesn't use indexes with wrong collation

#