Commit 54a47dcb authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files

Merge current 5.0 main tree and fix for bug#40546

parents e7fe2880 51a960e3

configure.in

+2 −2
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 change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.72)

AM_INIT_AUTOMAKE(mysql, 5.0.74)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=72

NDB_VERSION_BUILD=74

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/r/limit.result

+3 −0
Original line number Diff line number Diff line
@@ -111,3 +111,6 @@ set @a=-14632475938453979136; 
execute s using @a, @a;

ERROR HY000: Incorrect arguments to EXECUTE

End of 5.0 tests

select 1 as a limit 4294967296,10;

a

End of 5.1 tests

mysql-test/r/metadata.result

+17 −0
Original line number Diff line number Diff line
@@ -181,4 +181,21 @@ c1 c2 
3	3

DROP VIEW v1,v2;

DROP TABLE t1,t2;

CREATE TABLE t1 (i INT, d DATE);

INSERT INTO t1 VALUES (1, '2008-01-01'), (2, '2008-01-02'), (3, '2008-01-03');

SELECT COALESCE(d, d), IFNULL(d, d), IF(i, d, d),

CASE i WHEN i THEN d ELSE d END, GREATEST(d, d), LEAST(d, d)

FROM t1 ORDER BY RAND();

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

2008-01-01	2008-01-01	2008-01-01	2008-01-01	2008-01-01	2008-01-01

2008-01-02	2008-01-02	2008-01-02	2008-01-02	2008-01-02	2008-01-02

2008-01-03	2008-01-03	2008-01-03	2008-01-03	2008-01-03	2008-01-03

COALESCE(d, d)	IFNULL(d, d)	IF(i, d, d)	CASE i WHEN i THEN d ELSE d END	GREATEST(d, d)	LEAST(d, d)

def				CASE i WHEN i THEN d ELSE d END	CASE i WHEN i THEN d ELSE d END	10	10	10	Y	128	0	63

def				COALESCE(d, d)	COALESCE(d, d)	10	10	10	Y	128	0	63

def				GREATEST(d, d)	GREATEST(d, d)	10	10	10	Y	128	0	63

def				IF(i, d, d)	IF(i, d, d)	10	10	10	Y	128	0	63

def				IFNULL(d, d)	IFNULL(d, d)	10	10	10	Y	128	0	63

def				LEAST(d, d)	LEAST(d, d)	10	10	10	Y	128	0	63

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/order_by.result

+16 −0
Original line number Diff line number Diff line
@@ -1076,3 +1076,19 @@ set session max_sort_length= 2180; 
select * from t1 order by b;

ERROR HY001: Out of sort memory; increase server sort buffer size

drop table t1;

#

# Bug #39844: Query Crash Mysql Server 5.0.67

#

CREATE TABLE t1 (a INT PRIMARY KEY);

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

CREATE TABLE t3 (c INT);

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

INSERT INTO t2 (a,b) VALUES (1,2), (2,3);

INSERT INTO t3 (c) VALUES (1), (2);

SELECT

(SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a)

FROM t3;

(SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a)

2

NULL

DROP TABLE t1, t2, t3;

mysql-test/r/sp.result

+13 −0
Original line number Diff line number Diff line
@@ -6672,6 +6672,19 @@ select substr(`str`, `pos`+ 1 ) into `str`; 
end $

call `p2`('s s s s s s');

drop procedure `p2`;

drop table if exists t1;

drop procedure if exists p1;

create procedure p1() begin select * from t1; end$

call p1$

ERROR 42S02: Table 'test.t1' doesn't exist

create table t1 (a integer)$

call p1$

a

alter table t1 add b integer;

call p1$

a

drop table t1;

drop procedure p1;

# ------------------------------------------------------------------

# -- End of 5.0 tests

# ------------------------------------------------------------------