Commit 1c172c3b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1
parents 7e028f99 fe471dfd

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ bar@deer.(none) 
bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

mysql-test/r/derived.result

+19 −0
Original line number Diff line number Diff line
@@ -339,3 +339,22 @@ select distinct sum(b) from (select a,b from t1) y group by a; 
sum(b)

4

drop table t1;

create table t1(a int);

create table t2(a int);

create table t3(a int);

insert into t1 values(1),(1);

insert into t2 values(2),(2);

insert into t3 values(3),(3);

select * from t1 union distinct select * from t2 union all select * from t3;

a

1

2

3

3

select * from (select * from t1 union distinct select * from t2 union all select * from t3) X;

a

1

2

3

3

drop table t1, t2, t3;

mysql-test/r/user_var.result

+9 −7
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ drop table t1; 
set @a=_latin2'test';

select charset(@a),collation(@a),coercibility(@a);

charset(@a)	collation(@a)	coercibility(@a)

latin2	latin2_general_ci	3

latin2	latin2_general_ci	2

select @a=_latin2'TEST';

@a=_latin2'TEST'

1
@@ -133,12 +133,13 @@ select @a=_latin2'TEST' collate latin2_bin; 
set @a=_latin2'test' collate latin2_general_ci;

select charset(@a),collation(@a),coercibility(@a);

charset(@a)	collation(@a)	coercibility(@a)

latin2	latin2_general_ci	0

latin2	latin2_general_ci	2

select @a=_latin2'TEST';

@a=_latin2'TEST'

1

select @a=_latin2'TEST' collate latin2_bin;

ERROR HY000: Illegal mix of collations (latin2_general_ci,EXPLICIT) and (latin2_bin,EXPLICIT) for operation '='

@a=_latin2'TEST' collate latin2_bin

0

select charset(@a:=_latin2'test');

charset(@a:=_latin2'test')

latin2
@@ -147,21 +148,22 @@ collation(@a:=_latin2'test') 
latin2_general_ci

select coercibility(@a:=_latin2'test');

coercibility(@a:=_latin2'test')

3

2

select collation(@a:=_latin2'test' collate latin2_bin);

collation(@a:=_latin2'test' collate latin2_bin)

latin2_bin

select coercibility(@a:=_latin2'test' collate latin2_bin);

coercibility(@a:=_latin2'test' collate latin2_bin)

0

2

select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST';

(@a:=_latin2'test' collate latin2_bin) = _latin2'TEST'

0

select charset(@a),collation(@a),coercibility(@a);

charset(@a)	collation(@a)	coercibility(@a)

latin2	latin2_bin	0

latin2	latin2_bin	2

select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci;

ERROR HY000: Illegal mix of collations (latin2_bin,EXPLICIT) and (latin2_general_ci,EXPLICIT) for operation '='

(@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci

1

create table t1 (a varchar(50));

reset master;

SET TIMESTAMP=10000;

mysql-test/t/derived.test

+12 −0
Original line number Diff line number Diff line
@@ -224,3 +224,15 @@ select distinct sum(b) from t1 group by a; 
select distinct sum(b) from (select a,b from t1) y group by a;

drop table t1;



#

# test of union subquery in the FROM clause with complex distinct/all (BUG#6565)

#

create table t1(a int);

create table t2(a int);

create table t3(a int);

insert into t1 values(1),(1);

insert into t2 values(2),(2);

insert into t3 values(3),(3);

select * from t1 union distinct select * from t2 union all select * from t3;

select * from (select * from t1 union distinct select * from t2 union all select * from t3) X;

drop table t1, t2, t3;

mysql-test/t/user_var.test

+0 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ select @a=_latin2'TEST' collate latin2_bin; 
set @a=_latin2'test' collate latin2_general_ci;

select charset(@a),collation(@a),coercibility(@a);

select @a=_latin2'TEST';

--error 1267

select @a=_latin2'TEST' collate latin2_bin;



#
@@ -97,7 +96,6 @@ select collation(@a:=_latin2'test' collate latin2_bin); 
select coercibility(@a:=_latin2'test' collate latin2_bin);

select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST';

select charset(@a),collation(@a),coercibility(@a);

--error 1267

select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci;



# Check that user variables are binlogged correctly (BUG#3875)