Commit 99488b31 authored by tsmith@quadxeon.mysql.com's avatar tsmith@quadxeon.mysql.com
Browse files

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
parents a3bd5884 d5685d4c

CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -154,6 +154,11 @@ IF(EMBED_MANIFESTS) 
    # Disable automatic manifest generation.

    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 

    	   ${CMAKE_EXE_LINKER_FLAGS})

    # Explicitly disable it since it is the default for newer versions of VS

    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})

    IF(NOT tmp_manifest)

        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

    ENDIF(tmp_manifest)

    # Set the processor architecture.

    IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

    	SET(PROCESSOR_ARCH "X64")

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.42)

AM_INIT_AUTOMAKE(mysql, 5.0.44)

AM_CONFIG_HEADER(config.h)



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=42

NDB_VERSION_BUILD=44

NDB_VERSION_STATUS=""



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

mysql-test/r/bigint.result

+10 −0
Original line number Diff line number Diff line
@@ -352,3 +352,13 @@ select c1 mod 50 as result from t1; 
result

6

drop table t1;

select cast(19999999999999999999 as signed);

cast(19999999999999999999 as signed)

9223372036854775807

Warnings:

Error	1292	Truncated incorrect DECIMAL value: ''

select cast(-19999999999999999999 as signed);

cast(-19999999999999999999 as signed)

-9223372036854775808

Warnings:

Error	1292	Truncated incorrect DECIMAL value: ''

mysql-test/r/func_gconcat.result

+26 −0
Original line number Diff line number Diff line
@@ -737,4 +737,30 @@ SELECT GROUP_CONCAT(DISTINCT UCASE(b)) FROM t1; 
GROUP_CONCAT(DISTINCT UCASE(b))

ONE.1,TWO.2,ONE.3

DROP TABLE t1;

CREATE TABLE t1( a VARCHAR( 10 ), b INT );

INSERT INTO t1 VALUES ( repeat( 'a', 10 ), 1), 

( repeat( 'b', 10 ), 2);

SET group_concat_max_len = 20;

SELECT GROUP_CONCAT( a ) FROM t1;

GROUP_CONCAT( a )

aaaaaaaaaa,bbbbbbbbb

Warnings:

Warning	1260	1 line(s) were cut by GROUP_CONCAT()

SELECT GROUP_CONCAT( DISTINCT a ) FROM t1;

GROUP_CONCAT( DISTINCT a )

aaaaaaaaaa,bbbbbbbbb

Warnings:

Warning	1260	1 line(s) were cut by GROUP_CONCAT()

SELECT GROUP_CONCAT( a ORDER BY b ) FROM t1;

GROUP_CONCAT( a ORDER BY b )

aaaaaaaaaa,bbbbbbbbb

Warnings:

Warning	1260	1 line(s) were cut by GROUP_CONCAT()

SELECT GROUP_CONCAT( DISTINCT a ORDER BY b ) FROM t1;

GROUP_CONCAT( DISTINCT a ORDER BY b )

aaaaaaaaaa,bbbbbbbbb

Warnings:

Warning	1260	1 line(s) were cut by GROUP_CONCAT()

SET group_concat_max_len = DEFAULT;

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/func_group.result

+47 −0
Original line number Diff line number Diff line
@@ -1330,4 +1330,51 @@ SELECT a,AVG(DISTINCT b) AS average FROM t1 GROUP BY a HAVING average > 50; 
a	average

1	32768.5000

DROP TABLE t1;

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

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

EXPLAIN SELECT MIN(a), MIN(b) FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	

SELECT MIN(a), MIN(b) FROM t1;

MIN(a)	MIN(b)

NULL	1

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

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

EXPLAIN SELECT MIN(b), MIN(c) FROM t2 WHERE a = 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	a	a	5	const	2	Using where

SELECT MIN(b), MIN(c) FROM t2 WHERE a = 1;

MIN(b)	MIN(c)

3	2

CREATE TABLE t3 (a INT, b INT, c int, KEY(a, b));

INSERT INTO t3 VALUES (1, NULL, 1), (2, NULL, 2),  (2, NULL, 2),  (3, NULL, 3);

EXPLAIN SELECT MIN(a), MIN(b) FROM t3 where a = 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

SELECT MIN(a), MIN(b) FROM t3 where a = 2;

MIN(a)	MIN(b)

2	NULL

CREATE TABLE t4 (a INT, b INT, c int, KEY(a, b));

INSERT INTO t4 VALUES (1, 1, 1), (2, NULL, 2),  (2, NULL, 2),  (3, 1, 3);

EXPLAIN SELECT MIN(a), MIN(b) FROM t4 where a = 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

SELECT MIN(a), MIN(b) FROM t4 where a = 2;

MIN(a)	MIN(b)

2	NULL

SELECT MIN(b), min(c) FROM t4 where a = 2;

MIN(b)	min(c)

NULL	2

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

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

EXPLAIN SELECT MIN(a), MIN(b) FROM t5 WHERE a = 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

SELECT MIN(a), MIN(b) FROM t5 WHERE a = 1;

MIN(a)	MIN(b)

1	1

SELECT MIN(a), MIN(b) FROM t5 WHERE a = 1 and b > 1;

MIN(a)	MIN(b)

1	2

DROP TABLE t1, t2, t3, t4, t5;

End of 5.0 tests