Commit 276f0d4c authored by unknown's avatar unknown
Browse files

Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt


mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merge 5.0-opt -> 5.1-opt
mysql-test/r/group_by.result:
  merge 5.0-opt -> 5.1-opt
mysql-test/r/insert.result:
  merge 5.0-opt -> 5.1-opt
mysql-test/r/subselect.result:
  merge 5.0-opt -> 5.1-opt
mysql-test/t/group_by.test:
  merge 5.0-opt -> 5.1-opt
mysql-test/t/insert.test:
  merge 5.0-opt -> 5.1-opt
mysql-test/t/subselect.test:
  merge 5.0-opt -> 5.1-opt
mysql-test/t/view.test:
  merge 5.0-opt -> 5.1-opt
sql/item_cmpfunc.h:
  merge 5.0-opt -> 5.1-opt
sql/item_strfunc.h:
  merge 5.0-opt -> 5.1-opt
parents 4b2c3ac4 6447a7b6

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/func_in.result

+43 −0
Original line number Diff line number Diff line
@@ -351,6 +351,49 @@ 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

create table t1(f1 char(1));

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

mysql-test/r/func_str.result

+12 −0
Original line number Diff line number Diff line
@@ -1304,6 +1304,18 @@ id select_type table type possible_keys key key_len ref rows filtered 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,6 +933,108 @@ 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 = '';

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

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

EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2;

mysql-test/r/insert.result

+21 −0
Original line number Diff line number Diff line
@@ -347,6 +347,27 @@ select row_count(); 
row_count()

1

drop table t1;

create table t1 (f1 int unique, f2 int);

create table t2 (f3 int, f4 int);

create view v1 as select * from t1, t2 where f1= f3;

insert into t1 values (1,11), (2,22);

insert into t2 values (1,12), (2,24);

insert into v1 (f1) values (3) on duplicate key update f3= f3 + 10;

ERROR HY000: Can not modify more than one base table through a join view 'test.v1'

insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;

select * from t1;

f1	f2

1	11

2	22

3	NULL

insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;

select * from t1;

f1	f2

1	11

2	22

12	NULL

drop view v1;

drop table t1,t2;

create table t1 (id int primary key auto_increment, data int, unique(data));

insert ignore into t1 values(NULL,100),(NULL,110),(NULL,120);

insert ignore into t1 values(NULL,10),(NULL,20),(NULL,110),(NULL,120),(NULL,100),(NULL,90);