Commit 9f04f9d0 authored by unknown's avatar unknown
Browse files

Merge with 4.1 


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
netware/BUILD/nwbootstrap:
  merge: keep local
scripts/make_binary_distribution.sh:
  merge: keep local
sql/ha_heap.cc:
  Trivial merge
sql/ha_innodb.cc:
  Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
  Simple merge
sql/item_func.cc:
  Simple merge
sql/item_row.cc:
  Simple merge
sql/item_strfunc.cc:
  Simple merge
sql/item_subselect.cc:
  Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
parents 70d3ac05 0fe1b28b

client/mysqltest.c

+2 −0
Original line number Diff line number Diff line
@@ -2379,6 +2379,8 @@ void usage() 


#include <help_end.h>



#include <help_end.h>





static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

mysql-test/r/group_by.result

+2 −2
Original line number Diff line number Diff line
@@ -655,9 +655,9 @@ insert into t1 (a,b) values (1,2),(1,3),(2,5); 
select a, 0.1*0+1 r2, sum(1) r1 from t1 where a = 1 group  by a having r1>1 and r2=1;

a	r2	r1

1	1.0	2

select a, rand()*0+1 r2, sum(1) r1 from t1 where a = 1 group  by a having r1>1 and r2=1;

select a, round(rand(100)*10) r2, sum(1) r1 from t1 where a = 1 group  by a having r1>1 and r2<=2;

a	r2	r1

1	1	2

1	2	2

select a,sum(b) from t1 where a=1 group by c;

a	sum(b)

1	5

mysql-test/r/heap_hash.result

+10 −0
Original line number Diff line number Diff line
@@ -355,3 +355,13 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t3	ref	a	a	44	const,const	6	Using where

1	SIMPLE	t1	ref	heap_idx	heap_idx	22	const	7	Using where

drop table t1, t2, t3;

create temporary table t1 ( a int, index (a) ) engine=memory;

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

select a from t1 where a in (1,3);

a

1

3

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

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	a	a	5	NULL	2	Using where

drop table t1;

mysql-test/r/subselect.result

+5 −33
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ Note 1003 (select `test`.`t1`.`s1` AS `s1` from `test`.`t1`) 
s1

tttt

drop table t1;

create table t1 (s1 char(5) not null, index s1(s1));

create table t1 (s1 char(5), index s1(s1));

create table t2 (s1 char(5), index s1(s1));

insert into t1 values ('a1'),('a2'),('a3');

insert into t2 values ('a1'),('a2');
@@ -1459,25 +1459,25 @@ a2 1 
a3	1

explain extended select s1, s1 NOT IN (SELECT s1 FROM t2) from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	s1	5	NULL	3	Using index

1	PRIMARY	t1	index	NULL	s1	6	NULL	3	Using index

2	DEPENDENT SUBQUERY	t2	index_subquery	s1	s1	6	func	2	Using index

Warnings:

Note	1003	select `test`.`t1`.`s1` AS `s1`,not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL)))) AS `s1 NOT IN (SELECT s1 FROM t2)` from `test`.`t1`

explain extended select s1, s1 = ANY (SELECT s1 FROM t2) from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	s1	5	NULL	3	Using index

1	PRIMARY	t1	index	NULL	s1	6	NULL	3	Using index

2	DEPENDENT SUBQUERY	t2	index_subquery	s1	s1	6	func	2	Using index

Warnings:

Note	1003	select `test`.`t1`.`s1` AS `s1`,<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL))) AS `s1 = ANY (SELECT s1 FROM t2)` from `test`.`t1`

explain extended select s1, s1 <> ALL (SELECT s1 FROM t2) from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	s1	5	NULL	3	Using index

1	PRIMARY	t1	index	NULL	s1	6	NULL	3	Using index

2	DEPENDENT SUBQUERY	t2	index_subquery	s1	s1	6	func	2	Using index

Warnings:

Note	1003	select `test`.`t1`.`s1` AS `s1`,not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL)))) AS `s1 <> ALL (SELECT s1 FROM t2)` from `test`.`t1`

explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	s1	5	NULL	3	Using index

1	PRIMARY	t1	index	NULL	s1	6	NULL	3	Using index

2	DEPENDENT SUBQUERY	t2	index_subquery	s1	s1	6	func	1	Using index; Using where

Warnings:

Note	1003	select `test`.`t1`.`s1` AS `s1`,not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL where (`test`.`t2`.`s1` < _latin1'a2'))))) AS `s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2')` from `test`.`t1`
@@ -2133,34 +2133,6 @@ SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 
c

Oceania

drop table t1;

CREATE TABLE t1 ( f1 BIGINT );

INSERT INTO t1 SET f1= NULL;

INSERT INTO t1 SET f1= 1;

CREATE TABLE t2 ( f1 BIGINT );

SELECT f1 FROM t1

WHERE  f1 <> ALL ( SELECT f1 FROM t2 );

f1

NULL

1

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

SELECT f1 FROM t1

WHERE f1 <> ALL ( SELECT f1 FROM t2 WHERE f1 > 2 );

f1

NULL

1

SELECT f1 FROM t1

WHERE f1 <> ALL ( SELECT f1 FROM t2 WHERE f1 > 2

UNION

SELECT f1 FROM t2 WHERE f1 > 3);

f1

NULL

1

SELECT f1 FROM t1

WHERE f1 <> ALL ( SELECT SUM(f1) AS sf1 FROM t2 HAVING sf1 > 10000);

f1

NULL

1

drop table t1,t2;

create table t1 (a1 int);

create table t2 (b1 int);

select * from t1 where a2 > any(select b1 from t2);

mysql-test/r/user_var.result

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ select @a:=0; 
select @a, @a:=@a+count(*), count(*), @a from t1 group by i;

@a	@a:=@a+count(*)	count(*)	@a

0	1	1	0

0	3	2	0

0	6	3	0

0	2	2	0

0	3	3	0

select @a:=0;

@a:=0

0