Commit 92a7c1ed authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 

into  mysql.com:/home/gluh/MySQL/Merge/5.0


sql/item.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
parents ea41474b 24903ed5

mysql-test/r/delete.result

+8 −0
Original line number Diff line number Diff line
@@ -176,6 +176,14 @@ create table t1 (a int); 
delete `4.t1` from t1 as `4.t1` where `4.t1`.a = 5;

delete FROM `4.t1` USING t1 as `4.t1` where `4.t1`.a = 5;

drop table t1;

create table t1(f1 int primary key);

insert into t1 values (4),(3),(1),(2);

delete from t1 where (@a:= f1) order by f1 limit 1;

select @a;

@a

1

drop table t1;

End of 4.1 tests

CREATE TABLE t1 (a int not null,b int not null);

CREATE TABLE t2 (a int not null, b int not null, primary key (a,b));

CREATE TABLE t3 (a int not null, b int not null, primary key (a,b));

mysql-test/r/fulltext_left_join.result

+23 −0
Original line number Diff line number Diff line
@@ -67,3 +67,26 @@ id d e m_id f 
4	bword	aword	NULL	NULL

5	aword and bword	NULL	5	

drop table t1,t2;

CREATE TABLE t1 (

id int(10) NOT NULL auto_increment,

link int(10) default NULL,

name mediumtext default NULL,

PRIMARY KEY (id),

FULLTEXT (name)

);

INSERT INTO t1 VALUES (1, 1, 'string');

INSERT INTO t1 VALUES (2, 0, 'string');

CREATE TABLE t2 (

id int(10) NOT NULL auto_increment,

name mediumtext default NULL,

PRIMARY KEY (id),

FULLTEXT (name)

);

INSERT INTO t2 VALUES (1, 'string');

SELECT t1.*, MATCH(t1.name) AGAINST('string') AS relevance 

FROM t1 LEFT JOIN t2 ON t1.link = t2.id

WHERE MATCH(t1.name, t2.name) AGAINST('string' IN BOOLEAN MODE);

id	link	name	relevance

1	1	string	0

2	0	string	0

DROP TABLE t1,t2;

mysql-test/r/func_in.result

+43 −0
Original line number Diff line number Diff line
@@ -355,4 +355,47 @@ some_id 
1

2

drop table t1;

CREATE TABLE t1 (a int, b int, PRIMARY KEY (a));

INSERT INTO t1 VALUES (1,1),(2,1),(3,1),(4,1),(5,1),(6,1);

CREATE TABLE t2 (a int, b int, PRIMARY KEY (a));

INSERT INTO t2 VALUES (3,2),(4,2);

CREATE TABLE t3 (a int PRIMARY KEY);

INSERT INTO t3 VALUES (1),(2),(3),(4);

CREATE TABLE t4 (a int PRIMARY KEY);

INSERT INTO t4 VALUES (1),(2);

EXPLAIN SELECT STRAIGHT_JOIN * FROM t3 

JOIN t1 ON t3.a=t1.a 

JOIN t2 ON t3.a=t2.a

JOIN t4 WHERE t4.a IN (t1.b, t2.b);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	

1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	

1	SIMPLE	t4	ALL	PRIMARY	NULL	NULL	NULL	2	Range checked for each record (index map: 0x1)

SELECT STRAIGHT_JOIN * FROM t3 

JOIN t1 ON t3.a=t1.a 

JOIN t2 ON t3.a=t2.a

JOIN t4 WHERE t4.a IN (t1.b, t2.b);

a	a	b	a	b	a

3	3	1	3	2	1

3	3	1	3	2	2

4	4	1	4	2	1

4	4	1	4	2	2

EXPLAIN SELECT STRAIGHT_JOIN 

(SELECT SUM(t4.a) FROM t4 WHERE t4.a IN (t1.b, t2.b)) 

FROM t3, t1, t2

WHERE t3.a=t1.a AND t3.a=t2.a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index

1	PRIMARY	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	

1	PRIMARY	t2	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	

2	DEPENDENT SUBQUERY	t4	index	NULL	PRIMARY	4	NULL	2	Using where; Using index

SELECT STRAIGHT_JOIN 

(SELECT SUM(t4.a) FROM t4 WHERE t4.a IN (t1.b, t2.b)) 

FROM t3, t1, t2

WHERE t3.a=t1.a AND t3.a=t2.a;

(SELECT SUM(t4.a) FROM t4 WHERE t4.a IN (t1.b, t2.b))

3

3

DROP TABLE t1,t2,t3,t4;

End of 5.0 tests

mysql-test/r/func_str.result

+13 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ explain extended select md5('hello'), sha('abc'), sha1('abc'), soundex(''), 'moo 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

Warnings:

Note	1003	select md5(_latin1'hello') AS `md5('hello')`,sha(_latin1'abc') AS `sha('abc')`,sha(_latin1'abc') AS `sha1('abc')`,soundex(_latin1'') AS `soundex('')`,(soundex(_latin1'mood') = soundex(_latin1'mud')) AS `'mood' sounds like 'mud'`,aes_decrypt(aes_encrypt(_latin1'abc',_latin1'1'),_latin1'1') AS `aes_decrypt(aes_encrypt('abc','1'),'1')`,concat(_latin1'*',repeat(_latin1' ',5),_latin1'*') AS `concat('*',space(5),'*')`,reverse(_latin1'abc') AS `reverse('abc')`,rpad(_latin1'a',4,_latin1'1') AS `rpad('a',4,'1')`,lpad(_latin1'a',4,_latin1'1') AS `lpad('a',4,'1')`,concat_ws(_latin1',',_latin1'',NULL,_latin1'a') AS `concat_ws(',','',NULL,'a')`,make_set(255,_latin2'a',_latin2'b',_latin2'c') AS `make_set(255,_latin2'a',_latin2'b',_latin2'c')`,elt(2,1) AS `elt(2,1)`,locate(_latin1'a',_latin1'b',2) AS `locate("a","b",2)`,format(130,10) AS `format(130,10)`,char(0) AS `char(0)`,conv(130,16,10) AS `conv(130,16,10)`,hex(130) AS `hex(130)`,cast(_latin1'HE' as char charset binary) AS `binary 'HE'`,export_set(255,_latin2'y',_latin2'n',_latin2' ') AS `export_set(255,_latin2'y',_latin2'n',_latin2' ')`,field((_latin1'b' collate latin1_bin),_latin1'A',_latin1'B') AS `FIELD('b' COLLATE latin1_bin,'A','B')`,find_in_set(_latin1'B',_latin1'a,b,c,d') AS `FIND_IN_SET(_latin1'B',_latin1'a,b,c,d')`,collation(conv(130,16,10)) AS `collation(conv(130,16,10))`,coercibility(conv(130,16,10)) AS `coercibility(conv(130,16,10))`,length(_latin1'\n	\r\0\\_\\%\\') AS `length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,concat(_latin1'monty',_latin1' was here ',_latin1'again') AS `concat('monty',' was here ','again')`,length(_latin1'hello') AS `length('hello')`,char(ascii(_latin1'h')) AS `char(ascii('h'))`,ord(_latin1'h') AS `ord('h')`,quote((1 / 0)) AS `quote(1/0)`,crc32(_latin1'123') AS `crc32("123")`,replace(_latin1'aaaa',_latin1'a',_latin1'b') AS `replace('aaaa','a','b')`,insert(_latin1'txs',2,1,_latin1'hi') AS `insert('txs',2,1,'hi')`,left(_latin2'a',1) AS `left(_latin2'a',1)`,right(_latin2'a',1) AS `right(_latin2'a',1)`,lcase(_latin2'a') AS `lcase(_latin2'a')`,ucase(_latin2'a') AS `ucase(_latin2'a')`,substr(_latin1'abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)`,substring_index(_latin1'1abcd;2abcd;3abcd;4abcd',_latin1';',2) AS `substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2)`,trim(_latin2' a ') AS `trim(_latin2' a ')`,ltrim(_latin2' a ') AS `ltrim(_latin2' a ')`,rtrim(_latin2' a ') AS `rtrim(_latin2' a ')`,decode(encode(repeat(_latin1'a',100000))) AS `decode(encode(repeat("a",100000),"monty"),"monty")`

Note	1003	select md5(_latin1'hello') AS `md5('hello')`,sha(_latin1'abc') AS `sha('abc')`,sha(_latin1'abc') AS `sha1('abc')`,soundex(_latin1'') AS `soundex('')`,(soundex(_latin1'mood') = soundex(_latin1'mud')) AS `'mood' sounds like 'mud'`,aes_decrypt(aes_encrypt(_latin1'abc',_latin1'1'),_latin1'1') AS `aes_decrypt(aes_encrypt('abc','1'),'1')`,concat(_latin1'*',repeat(_latin1' ',5),_latin1'*') AS `concat('*',space(5),'*')`,reverse(_latin1'abc') AS `reverse('abc')`,rpad(_latin1'a',4,_latin1'1') AS `rpad('a',4,'1')`,lpad(_latin1'a',4,_latin1'1') AS `lpad('a',4,'1')`,concat_ws(_latin1',',_latin1'',NULL,_latin1'a') AS `concat_ws(',','',NULL,'a')`,make_set(255,_latin2'a',_latin2'b',_latin2'c') AS `make_set(255,_latin2'a',_latin2'b',_latin2'c')`,elt(2,1) AS `elt(2,1)`,locate(_latin1'a',_latin1'b',2) AS `locate("a","b",2)`,format(130,10) AS `format(130,10)`,char(0) AS `char(0)`,conv(130,16,10) AS `conv(130,16,10)`,hex(130) AS `hex(130)`,cast(_latin1'HE' as char charset binary) AS `binary 'HE'`,export_set(255,_latin2'y',_latin2'n',_latin2' ') AS `export_set(255,_latin2'y',_latin2'n',_latin2' ')`,field((_latin1'b' collate latin1_bin),_latin1'A',_latin1'B') AS `FIELD('b' COLLATE latin1_bin,'A','B')`,find_in_set(_latin1'B',_latin1'a,b,c,d') AS `FIND_IN_SET(_latin1'B',_latin1'a,b,c,d')`,collation(conv(130,16,10)) AS `collation(conv(130,16,10))`,coercibility(conv(130,16,10)) AS `coercibility(conv(130,16,10))`,length(_latin1'\n	\r\0\\_\\%\\') AS `length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,concat(_latin1'monty',_latin1' was here ',_latin1'again') AS `concat('monty',' was here ','again')`,length(_latin1'hello') AS `length('hello')`,char(ascii(_latin1'h')) AS `char(ascii('h'))`,ord(_latin1'h') AS `ord('h')`,quote((1 / 0)) AS `quote(1/0)`,crc32(_latin1'123') AS `crc32("123")`,replace(_latin1'aaaa',_latin1'a',_latin1'b') AS `replace('aaaa','a','b')`,insert(_latin1'txs',2,1,_latin1'hi') AS `insert('txs',2,1,'hi')`,left(_latin2'a',1) AS `left(_latin2'a',1)`,right(_latin2'a',1) AS `right(_latin2'a',1)`,lcase(_latin2'a') AS `lcase(_latin2'a')`,ucase(_latin2'a') AS `ucase(_latin2'a')`,substr(_latin1'abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)`,substring_index(_latin1'1abcd;2abcd;3abcd;4abcd',_latin1';',2) AS `substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2)`,trim(_latin2' a ') AS `trim(_latin2' a ')`,ltrim(_latin2' a ') AS `ltrim(_latin2' a ')`,rtrim(_latin2' a ') AS `rtrim(_latin2' a ')`,decode(encode(repeat(_latin1'a',100000),'monty'),'monty') AS `decode(encode(repeat("a",100000),"monty"),"monty")`

SELECT lpad(12345, 5, "#");

lpad(12345, 5, "#")

12345
@@ -1084,6 +1084,18 @@ id select_type table type possible_keys key key_len ref rows Extra 
Warnings:

Note	1003	select `test`.`t1`.`s` AS `s` from `test`.`t1` where (trim(both _latin1'y' from `test`.`t1`.`s`) > _latin1'ab')

DROP TABLE t1;

create table t1(f1 varchar(4));

explain extended select encode(f1,'zxcv') as 'enc' from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	0	const row not found

Warnings:

Note	1003	select encode(`test`.`t1`.`f1`,'zxcv') AS `enc` from `test`.`t1`

explain extended select decode(f1,'zxcv') as 'enc' from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	0	const row not found

Warnings:

Note	1003	select decode(`test`.`t1`.`f1`,'zxcv') AS `enc` from `test`.`t1`

drop table t1;

End of 4.1 tests

create table t1 (d decimal default null);

insert into t1 values (null);

mysql-test/r/group_by.result

+102 −0
Original line number Diff line number Diff line
@@ -933,3 +933,105 @@ b sum(1) 
18	6

19	6

DROP TABLE t1;

CREATE TABLE t1 (a INT PRIMARY KEY, b INT);

INSERT INTO t1 VALUES (1,1),(2,1),(3,2),(4,2),(5,3),(6,3);

SET SQL_MODE = 'ONLY_FULL_GROUP_BY';

SELECT MAX(a)-MIN(a) FROM t1 GROUP BY b;

MAX(a)-MIN(a)

1

1

1

SELECT CEILING(MIN(a)) FROM t1 GROUP BY b;

CEILING(MIN(a))

1

3

5

SELECT CASE WHEN AVG(a)>=0 THEN 'Positive' ELSE 'Negative' END FROM t1 

GROUP BY b;

CASE WHEN AVG(a)>=0 THEN 'Positive' ELSE 'Negative' END

Positive

Positive

Positive

SELECT a + 1 FROM t1 GROUP BY a;

a + 1

2

3

4

5

6

7

SELECT a + b FROM t1 GROUP BY b;

ERROR 42000: 'test.t1.a' isn't in GROUP BY

SELECT (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1) 

FROM t1 AS t1_outer;

(SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1)

1

2

3

4

5

6

SELECT 1 FROM t1 as t1_outer GROUP BY a 

HAVING (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1);

1

1

1

1

1

1

1

SELECT (SELECT t1_outer.a FROM t1 AS t1_inner LIMIT 1) 

FROM t1 AS t1_outer GROUP BY t1_outer.b;

ERROR 42000: 'test.t1_outer.a' isn't in GROUP BY

SELECT 1 FROM t1 as t1_outer GROUP BY a 

HAVING (SELECT t1_outer.b FROM t1 AS t1_inner LIMIT 1);

ERROR 42S22: Unknown column 'test.t1_outer.b' in 'field list'

SELECT (SELECT SUM(t1_inner.a) FROM t1 AS t1_inner LIMIT 1) 

FROM t1 AS t1_outer GROUP BY t1_outer.b;

(SELECT SUM(t1_inner.a) FROM t1 AS t1_inner LIMIT 1)

21

21

21

SELECT (SELECT SUM(t1_inner.a) FROM t1 AS t1_inner GROUP BY t1_inner.b LIMIT 1)

FROM t1 AS t1_outer;

(SELECT SUM(t1_inner.a) FROM t1 AS t1_inner GROUP BY t1_inner.b LIMIT 1)

3

3

3

3

3

3

SELECT (SELECT SUM(t1_outer.a) FROM t1 AS t1_inner LIMIT 1) 

FROM t1 AS t1_outer GROUP BY t1_outer.b;

ERROR 42000: 'test.t1_outer.a' isn't in GROUP BY

SELECT 1 FROM t1 as t1_outer 

WHERE (SELECT t1_outer.b FROM t1 AS t1_inner GROUP BY t1_inner.b LIMIT 1);

1

1

1

1

1

1

1

SELECT b FROM t1 GROUP BY b HAVING CEILING(b) > 0;

b

1

2

3

SELECT 1 FROM t1 GROUP BY b HAVING b = 2 OR b = 3 OR SUM(a) > 12;

1

1

1

SELECT 1 FROM t1 GROUP BY b HAVING ROW (b,b) = ROW (1,1);

1

1

SELECT 1 FROM t1 GROUP BY b HAVING a = 2;

ERROR 42S22: Unknown column 'a' in 'having clause'

SELECT 1 FROM t1 GROUP BY SUM(b);

ERROR HY000: Invalid use of group function

SELECT b FROM t1 AS t1_outer GROUP BY a HAVING t1_outer.a IN 

(SELECT SUM(t1_inner.b)+t1_outer.b FROM t1 AS t1_inner GROUP BY t1_inner.a

HAVING SUM(t1_inner.b)+t1_outer.b > 5);

ERROR 42000: 'test.t1_outer.b' isn't in GROUP BY

DROP TABLE t1;

SET SQL_MODE = '';