Commit cea66abf authored by unknown's avatar unknown
Browse files

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

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


mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
sql/sql_udf.cc:
  SCCS merged
parents d9ec5a4e 42e31f7a

mysql-test/r/distinct.result

+37 −0
Original line number Diff line number Diff line
@@ -607,3 +607,40 @@ id select_type table type possible_keys key key_len ref rows Extra 
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;

a	a

DROP TABLE t1;

CREATE TABLE t1 (a CHAR(1));

INSERT INTO t1 VALUES('A'), (0);

SELECT a FROM t1 WHERE a=0;

a

A

0

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'A'

SELECT DISTINCT a FROM t1 WHERE a=0;

a

A

0

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'A'

DROP TABLE t1;

CREATE TABLE t1 (a DATE);

INSERT INTO t1 VALUES ('1972-07-29'), ('1972-02-06');

EXPLAIN SELECT (SELECT DISTINCT a FROM t1 WHERE a = '2002-08-03');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

EXPLAIN SELECT (SELECT DISTINCT ADDDATE(a,1) FROM t1

WHERE ADDDATE(a,1) = '2002-08-03');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where; Using temporary

CREATE TABLE t2 (a CHAR(5) CHARACTER SET latin1 COLLATE latin1_general_ci);

INSERT INTO t2 VALUES (0xf6);

INSERT INTO t2 VALUES ('oe');

SELECT COUNT(*) FROM (SELECT DISTINCT a FROM t2) dt;

COUNT(*)

2

SELECT COUNT(*) FROM 

(SELECT DISTINCT a FROM t2 WHERE a='oe' COLLATE latin1_german2_ci) dt;

COUNT(*)

2

DROP TABLE t1, t2;

mysql-test/r/gis-rtree.result

+11 −0
Original line number Diff line number Diff line
@@ -881,3 +881,14 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field 
INSERT INTO t1(foo) VALUES ('');

ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field

DROP TABLE t1;

CREATE TABLE t1 (a INT AUTO_INCREMENT, b POINT NOT NULL, KEY (a), SPATIAL KEY (b));

INSERT INTO t1 (b) VALUES (GeomFromText('POINT(1 2)'));

INSERT INTO t1 (b) SELECT b FROM t1;

INSERT INTO t1 (b) SELECT b FROM t1;

INSERT INTO t1 (b) SELECT b FROM t1;

INSERT INTO t1 (b) SELECT b FROM t1;

INSERT INTO t1 (b) SELECT b FROM t1;

OPTIMIZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

DROP TABLE t1;

mysql-test/r/ps.result

+15 −0
Original line number Diff line number Diff line
@@ -1522,6 +1522,21 @@ Variable_name Value 
Slow_queries	1

deallocate prepare no_index;

deallocate prepare sq;

CREATE TABLE t1 (a int);

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

CREATE TABLE t2 (b int);

INSERT INTO t2 VALUES (NULL);

SELECT a FROM t1 WHERE (SELECT b FROM t2) IS NULL;

a

1

2

PREPARE stmt FROM 'SELECT a FROM t1 WHERE (SELECT b FROM t2) IS NULL';

EXECUTE stmt;

a

1

2

DEALLOCATE PREPARE stmt;

DROP TABLE t1,t2;

End of 5.0 tests.

create procedure proc_1() reset query cache;

call proc_1();

mysql-test/r/subselect.result

+13 −0
Original line number Diff line number Diff line
@@ -3033,6 +3033,19 @@ t3 CREATE TABLE `t3` ( 
  `a` datetime DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1,t2,t3;

CREATE TABLE t1 (a int);

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

SELECT a FROM t1 WHERE (SELECT 1 FROM DUAL WHERE 1=0) > 0;

a

SELECT a FROM t1 WHERE (SELECT 1 FROM DUAL WHERE 1=0) IS NULL;

a

1

2

EXPLAIN SELECT a FROM t1 WHERE (SELECT 1 FROM DUAL WHERE 1=0) IS NULL;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	

2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE

DROP TABLE t1;

create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);

mysql-test/r/udf.result

+11 −0
Original line number Diff line number Diff line
@@ -232,6 +232,17 @@ DROP FUNCTION sequence; 
DROP FUNCTION lookup;

DROP FUNCTION reverse_lookup;

DROP FUNCTION avgcost;

select * from mysql.func;

name	ret	dl	type

CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";

select IS_const(3);

IS_const(3)

const

drop function IS_const;

select * from mysql.func;

name	ret	dl	type

select is_const(3);

ERROR 42000: FUNCTION test.is_const does not exist

CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";

select

is_const(3) as const,