Commit ef5b6b19 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/mysql_priv.h:
  Auto merged
parents 2d48a1f2 f6493451

mysql-test/r/ctype_ucs.result

+21 −0
Original line number Diff line number Diff line
@@ -755,6 +755,27 @@ select export_set(5, name, upper(name), ",", 5) from bug20536; 
export_set(5, name, upper(name), ",", 5)

test1,TEST1,test1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'

CREATE TABLE t1 (

status enum('active','passive') collate latin1_general_ci 

NOT NULL default 'passive'

);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `status` enum('active','passive') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 ADD a int NOT NULL AFTER status;

CREATE TABLE t2 (

status enum('active','passive') collate ucs2_turkish_ci 

NOT NULL default 'passive'

);

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `status` enum('active','passive') CHARACTER SET ucs2 COLLATE ucs2_turkish_ci NOT NULL DEFAULT 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t2 ADD a int NOT NULL AFTER status;

DROP TABLE t1,t2;

select password(name) from bug20536;

password(name)

????????????????????

mysql-test/r/func_gconcat.result

+9 −0
Original line number Diff line number Diff line
@@ -660,3 +660,12 @@ CHAR_LENGTH( GROUP_CONCAT(b) ) 
240001

SET GROUP_CONCAT_MAX_LEN = 1024;

DROP TABLE t1;

CREATE TABLE t1 (a int, b int);

INSERT INTO t1 VALUES (2,1), (1,2), (2,2), (1,3);

SELECT GROUP_CONCAT(a), x 

FROM (SELECT a, GROUP_CONCAT(b) x FROM t1 GROUP BY a) AS s

GROUP BY x;

GROUP_CONCAT(a)	x

2	1,2

1	2,3

DROP TABLE t1;

mysql-test/r/func_group.result

+2 −2
Original line number Diff line number Diff line
@@ -851,8 +851,8 @@ CREATE TABLE t1 (a INT, b INT); 
INSERT INTO t1 VALUES (1,1),(1,2),(2,3);

SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT t1.b))

0

2

1

SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT 12))

1
@@ -1004,7 +1004,7 @@ SELECT SQL_NO_CACHE 
WHERE ttt.a = ccc.b AND ttt.a = t.a GROUP BY ttt.a) AS minid   

FROM t1 t, t2 c WHERE t.a = c.b;

minid

NULL

1

DROP TABLE t1,t2;

create table t1 select variance(0);

show create table t1;

mysql-test/r/func_in.result

+68 −0
Original line number Diff line number Diff line
@@ -343,3 +343,71 @@ some_id 
1

2

drop table t1;

create table t1(f1 char(1));

insert into t1 values ('a'),('b'),('1');

select f1 from t1 where f1 in ('a',1);

f1

a

1

select f1, case f1 when 'a' then '+' when 1 then '-' end from t1;

f1	case f1 when 'a' then '+' when 1 then '-' end

a	+

b	NULL

1	-

create index t1f1_idx on t1(f1);

select f1 from t1 where f1 in ('a',1);

f1

1

a

explain select f1 from t1 where f1 in ('a',1);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	t1f1_idx	2	NULL	3	Using where; Using index

select f1 from t1 where f1 in ('a','b');

f1

a

b

explain select f1 from t1 where f1 in ('a','b');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	t1f1_idx	t1f1_idx	2	NULL	3	Using where; Using index

select f1 from t1 where f1 in (2,1);

f1

1

explain select f1 from t1 where f1 in (2,1);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	t1f1_idx	t1f1_idx	2	NULL	3	Using where; Using index

create table t2(f2 int, index t2f2(f2));

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

select f2 from t2 where f2 in ('a',2);

f2

0

2

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

Warning	1292	Truncated incorrect DOUBLE value: 'a'

Warning	1292	Truncated incorrect DOUBLE value: 'a'

explain select f2 from t2 where f2 in ('a',2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	t2f2	5	NULL	3	Using where; Using index

select f2 from t2 where f2 in ('a','b');

f2

0

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

Warning	1292	Truncated incorrect DOUBLE value: 'b'

explain select f2 from t2 where f2 in ('a','b');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	t2f2	t2f2	5	NULL	3	Using where; Using index

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

Warning	1292	Truncated incorrect DOUBLE value: 'b'

select f2 from t2 where f2 in (1,'b');

f2

0

1

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'b'

Warning	1292	Truncated incorrect DOUBLE value: 'b'

explain select f2 from t2 where f2 in (1,'b');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	t2f2	5	NULL	3	Using where; Using index

drop table t1, t2;

mysql-test/r/range.result

+14 −0
Original line number Diff line number Diff line
@@ -941,3 +941,17 @@ item started price 
A1	2005-11-01 08:00:00	1000.000

A1	2005-11-15 00:00:00	2000.000

DROP TABLE t1;

create table t1 (a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t2 (a int, b int, filler char(100));

insert into t2 select A.a + 10 * (B.a + 10 * C.a), 10, 'filler' from t1 A,

t1 B, t1 C where A.a < 5;

insert into t2 select 1000, b, 'filler' from t2;

alter table t2 add index (a,b);

select 'In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)' Z;

Z

In following EXPLAIN the access method should be ref, #rows~=500 (and not 2)

explain select * from t2 where a=1000 and b<11;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	a	a	5	const	502	Using where

drop table t1, t2;