Commit 20d2727b authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/M41/mysql-4.1
parents c580293e bc0eef3e

include/my_global.h

+1 −4
Original line number Diff line number Diff line
@@ -375,10 +375,7 @@ int __void__; 
#endif



/* Define some useful general macros */

#if defined(__cplusplus) && defined(__GNUC__)

#define max(a, b)	((a) >? (b))

#define min(a, b)	((a) <? (b))

#elif !defined(max)

#if !defined(max)

#define max(a, b)	((a) > (b) ? (a) : (b))

#define min(a, b)	((a) < (b) ? (a) : (b))

#endif

mysql-test/r/ndb_autodiscover.result

+0 −14
Original line number Diff line number Diff line
@@ -358,20 +358,6 @@ Database 
mysql

test

use test;

CREATE TABLE sys.SYSTAB_0 (a int);

ERROR 42S01: Table 'SYSTAB_0' already exists

select * from sys.SYSTAB_0;

ERROR HY000: Failed to open 'SYSTAB_0', error while unpacking from engine

CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);

show warnings;

Level	Code	Message

select * from sys.SYSTAB_0;

ERROR HY000: Failed to open 'SYSTAB_0', error while unpacking from engine

drop table sys.SYSTAB_0;

ERROR 42S02: Unknown table 'SYSTAB_0'

drop table IF EXISTS sys.SYSTAB_0;

Warnings:

Note	1051	Unknown table 'SYSTAB_0'

CREATE TABLE t9 (

a int NOT NULL PRIMARY KEY,

b int

mysql-test/r/subselect.result

+6 −0
Original line number Diff line number Diff line
@@ -2721,3 +2721,9 @@ SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessioni 
ip	count( e.itemid )

10.10.10.1	1

drop tables t1,t2;

create table t1 (fld enum('0','1'));

insert into t1 values ('1');

select * from (select max(fld) from t1) as foo;

max(fld)

1

drop table t1;

mysql-test/t/ndb_autodiscover.test

+14 −13
Original line number Diff line number Diff line
@@ -460,19 +460,20 @@ use test; 
# a table with tha same name as a table that can't be

# discovered( for example a table created via NDBAPI)



--error 1050

CREATE TABLE sys.SYSTAB_0 (a int);

--error 1105

select * from sys.SYSTAB_0;



CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);

show warnings;

--error 1105

select * from sys.SYSTAB_0;



--error 1051

drop table sys.SYSTAB_0;

drop table IF EXISTS sys.SYSTAB_0;

# Test disabled since it doesn't work on case insensitive systems

#--error 1050

#CREATE TABLE sys.SYSTAB_0 (a int);

#--error 1105

#select * from sys.SYSTAB_0;



#CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);

#show warnings;

#--error 1105

#select * from sys.SYSTAB_0;



#--error 1051

#drop table sys.SYSTAB_0;

#drop table IF EXISTS sys.SYSTAB_0;



######################################################

# Note! This should always be the last step in this

mysql-test/t/subselect.test

+8 −0
Original line number Diff line number Diff line
@@ -1746,3 +1746,11 @@ CREATE TABLE `t2` ( 
INSERT INTO `t2` VALUES (1, 1, 1, '10.10.10.1');

SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessionid WHERE e.sessionid = ( SELECT sessionid FROM t2 ORDER BY sessionid DESC LIMIT 1 ) GROUP BY s.ip HAVING count( e.itemid ) >0 LIMIT 0 , 30;

drop tables t1,t2;



# BUG#11821 : Select from subselect using aggregate function on an enum

# segfaults:

create table t1 (fld enum('0','1'));

insert into t1 values ('1');

select * from (select max(fld) from t1) as foo;

drop table t1;