Commit 77341226 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
parents cdbe7302 a79e08a6

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.17-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.18-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

mysql-test/r/create.result

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ t2 CREATE TABLE `t2` ( 
  `ifnull(c,c)` mediumint(8) DEFAULT NULL,

  `ifnull(d,d)` int(11) DEFAULT NULL,

  `ifnull(e,e)` bigint(20) DEFAULT NULL,

  `ifnull(f,f)` float(24,2) DEFAULT NULL,

  `ifnull(g,g)` double(53,3) DEFAULT NULL,

  `ifnull(f,f)` float(3,2) DEFAULT NULL,

  `ifnull(g,g)` double(4,3) DEFAULT NULL,

  `ifnull(h,h)` decimal(5,4) DEFAULT NULL,

  `ifnull(i,i)` year(4) DEFAULT NULL,

  `ifnull(j,j)` date DEFAULT NULL,

mysql-test/r/func_in.result

+5 −0
Original line number Diff line number Diff line
@@ -477,6 +477,11 @@ a 
Warnings:

Warning	1292	Incorrect date value: '19772-07-29' for column 'a' at row 1

DROP TABLE t1,t2,t3,t4;

CREATE TABLE t1 (id int not null);

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

SELECT id FROM t1 WHERE id IN(4564, (SELECT IF(1=0,1,1/0)) );

id

DROP TABLE t1;

End of 5.0 tests

create table t1(f1 char(1));

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

mysql-test/r/insert_select.result

+29 −0
Original line number Diff line number Diff line
@@ -730,3 +730,32 @@ f1 f2 
2	2

10	10

DROP TABLE t1, t2;

SET SQL_MODE='STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';

CREATE TABLE t1 (c VARCHAR(30), INDEX ix_c (c(10)));

CREATE TABLE t2 (d VARCHAR(10));

INSERT INTO t1 (c) VALUES ('7_chars'), ('13_characters');

EXPLAIN

SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters') FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	

2	SUBQUERY	t1	ref	ix_c	ix_c	13	const	1	Using where

SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters') FROM t1;

(SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters')

13

13

INSERT INTO t2 (d) 

SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='13_characters') FROM t1;

INSERT INTO t2 (d) 

SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c='7_chars') FROM t1;

INSERT INTO t2 (d)

SELECT (SELECT SUM(LENGTH(c)) FROM t1 WHERE c IN (SELECT t1.c FROM t1)) 

FROM t1;

SELECT * FROM t2;

d

13

13

7

7

20

20

DROP TABLE t1,t2;

mysql-test/r/subselect.result

+31 −6
Original line number Diff line number Diff line
@@ -3712,12 +3712,6 @@ bb 2 
cc	3

dd	1

DROP TABLE t1,t2,t3;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;

CREATE TABLE t1(f1 int);

CREATE TABLE t2(f2 int, f21 int, f3 timestamp);

INSERT INTO t1 VALUES (1),(1),(2),(2);
@@ -3886,3 +3880,34 @@ this is a test. 3 
this is a test.	1

this is a test.	2

DROP table t1;

CREATE TABLE t1 (a int, b int);

CREATE TABLE t2 (m int, n int);

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

INSERT INTO t2 VALUES (1,11), (2,22), (3,32), (4,44), (4,44);

SELECT COUNT(*), a,

(SELECT m FROM t2 WHERE m = count(*) LIMIT 1)

FROM t1 GROUP BY a;

COUNT(*)	a	(SELECT m FROM t2 WHERE m = count(*) LIMIT 1)

2	2	2

3	3	3

1	4	1

SELECT COUNT(*), a,

(SELECT MIN(m) FROM t2 WHERE m = count(*))

FROM t1 GROUP BY a;

COUNT(*)	a	(SELECT MIN(m) FROM t2 WHERE m = count(*))

2	2	2

3	3	3

1	4	1

SELECT COUNT(*), a       

FROM t1 GROUP BY a

HAVING (SELECT MIN(m) FROM t2 WHERE m = count(*)) > 1;

COUNT(*)	a

2	2

3	3

DROP TABLE t1,t2;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;