Commit 15ff7fd8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


include/my_global.h:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Merge
parents 4c99c0e7 c9956b6a

include/my_global.h

+1 −4
Original line number Diff line number Diff line
@@ -396,10 +396,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 −15
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ drop table t1; 
use test2;

drop table t2;

drop database test2;

use test;

drop database if exists test_only_ndb_tables;

create database test_only_ndb_tables;

use test_only_ndb_tables;
@@ -383,20 +382,6 @@ select * from t1; 
ERROR HY000: Can't lock file (errno: 4009)

use test;

drop database test_only_ndb_tables;

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/t/ndb_autodiscover.test

+14 −13
Original line number Diff line number Diff line
@@ -501,19 +501,20 @@ drop database test_only_ndb_tables; 
# 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