Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/m51new


configure.in:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge

mysql-test/Makefile.am

@@ -17,18 +17,8 @@
 
 ## Process this file with automake to create Makefile.in
 
-if HAVE_NDBCLUSTER_DB
 SUBDIRS = ndb
 DIST_SUBDIRS=ndb
-USE_NDBCLUSTER=\"--ndbcluster\"
-else
-# If one uses automake conditionals, automake will automatically
-# include all possible branches to DIST_SUBDIRS goal.
-# Reset DIST_SUBDIRS if we don't use NDB
-SUBDIRS=
-DIST_SUBDIRS=
-USE_NDBCLUSTER=\"\"
-endif
 
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
@@ -126,7 +116,7 @@ SUFFIXES = .sh
 	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
 	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-	  -e 's!@''USE_NDBCLUSTER''@!$(USE_NDBCLUSTER)!g' \
+	  -e 's!@''USE_NDBCLUSTER''@!@TEST_NDBCLUSTER@!g' \
 	  $< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@

mysql-test/r/ps_1general.result

@@ -320,21 +320,6 @@ prepare stmt4 from ' show errors limit 20 ';
 ERROR HY000: This command is not supported in the prepared statement protocol yet
 prepare stmt4 from ' show storage engines ';
 execute stmt4;
-Engine	Support	Comment
-MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance
-MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables
-InnoDB	YES/NO	Supports transactions, row-level locking, and foreign keys
-BerkeleyDB	YES/NO	Supports transactions and page-level locking
-BLACKHOLE	YES/NO	/dev/null storage engine (anything you write to it disappears)
-EXAMPLE	YES/NO	Example storage engine
-ARCHIVE	YES/NO	Archive storage engine
-CSV	YES/NO	CSV storage engine
-ndbcluster	YES/NO	Clustered, fault-tolerant, memory-based tables
-FEDERATED	YES/NO	Federated MySQL storage engine
-MRG_MYISAM	YES/NO	Collection of identical MyISAM tables
-binlog	YES/NO	This is a meta storage engine to represent the binlog in a transaction
-ISAM	YES/NO	Obsolete storage engine
-partition	YES/NO	Partition engine
 drop table if exists t5;
 prepare stmt1 from ' drop table if exists t5 ' ;
 execute stmt1 ;

mysql-test/r/show_check.result

@@ -518,7 +518,7 @@ Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	I
 t1	NULL	NULL	NULL	NULL	#	#	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Incorrect information in file: './test/t1.frm'
 show create table t1;
 ERROR HY000: Incorrect information in file: './test/t1.frm'
-drop table t1;
+drop table if exists t1;
 CREATE TABLE txt1(a int);
 CREATE TABLE tyt2(a int);
 CREATE TABLE urkunde(a int);

mysql-test/r/sql_mode.result

@@ -423,24 +423,6 @@ a\b	a\"b	a'\b	a'\"b
 SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";
 a\b	a\'b	a"\b	a"\'b
 a\b	a\'b	a"\b	a"\'b
-set session sql_mode = 'NO_ENGINE_SUBSTITUTION';
-create table t1 (a int) engine=isam;
-ERROR HY000: The 'ISAM' feature is disabled; you need MySQL built with 'ISAM' to have it working
-show create table t1;
-ERROR 42S02: Table 'test.t1' doesn't exist
-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
-set session sql_mode = '';
-create table t1 (a int) engine=isam;
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table t1;
 SET @@SQL_MODE='';
 create function `foo` () returns int return 5;
 show create function `foo`;

mysql-test/r/warnings.result

@@ -166,13 +166,6 @@ show variables like 'max_error_count';
 Variable_name	Value
 max_error_count	10
 drop table t1;
-create table t1 (id int) engine=isam;
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
-alter table t1 engine=isam;
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
-drop table t1;
 create table t1 (id int) type=heap;
 Warnings:
 Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead

mysql-test/t/ps_1general.test

@@ -342,8 +342,11 @@ prepare stmt4 from ' show warnings limit 20 ';
 --error 1295
 prepare stmt4 from ' show errors limit 20 ';
 prepare stmt4 from ' show storage engines ';
---replace_column 2 YES/NO
+# The output depends upon the precise order in which
+# storage engines are registered, so we switch off the output.
+--disable_result_log
 execute stmt4;
+--enable_result_log
 
 ################ MISC STUFF ################
 ## get a warning and an error

mysql-test/t/show_check.test

@@ -396,7 +396,8 @@ system echo "this is a junk file for test" >> var/master-data/test/t1.frm ;
 SHOW TABLE STATUS like 't1';
 --error 1033
 show create table t1;
-drop table t1;
+drop table if exists t1;
+system rm -f var/master-data/test/t1.frm ;
 
 
 # End of 4.1 tests

mysql-test/t/sql_mode.test

@@ -209,18 +209,18 @@ SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";
 #           is not available
 #
 
-set session sql_mode = 'NO_ENGINE_SUBSTITUTION';
---error 1289
-create table t1 (a int) engine=isam;
---error 1146
-show create table t1;
-drop table if exists t1;
-
-# for comparison, lets see the warnings...
-set session sql_mode = '';
-create table t1 (a int) engine=isam;
-show create table t1;
-drop table t1;
+#set session sql_mode = 'NO_ENGINE_SUBSTITUTION';
+#--error 1289
+#create table t1 (a int) engine=isam;
+#--error 1146
+#show create table t1;
+#drop table if exists t1;
+#
+## for comparison, lets see the warnings...
+#set session sql_mode = '';
+#create table t1 (a int) engine=isam;
+#show create table t1;
+#drop table t1;
 
 #
 # Bug #6903: ANSI_QUOTES does not come into play with SHOW CREATE FUNCTION

mysql-test/t/system_mysql_db_fix.test

@@ -34,7 +34,7 @@ CREATE TABLE db (
   PRIMARY KEY Host (Host,Db,User),
   KEY User (User)
 )
-type=ISAM;
+type=MyISAM;
 --enable-warnings
 
 INSERT INTO db VALUES ('%','test',   '','Y','Y','Y','Y','Y','Y');
@@ -52,7 +52,7 @@ CREATE TABLE host (
   Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,
   PRIMARY KEY Host (Host,Db)
 )
-type=ISAM;
+type=MyISAM;
 --enable-warnings
 
 --disable_warnings
@@ -71,7 +71,7 @@ CREATE TABLE user (
   Process_priv enum('N','Y') DEFAULT 'N' NOT NULL,
   PRIMARY KEY Host (Host,User)
 )
-type=ISAM;
+type=MyISAM;
 --enable-warnings
 
 INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y');

mysql-test/t/view.test

@@ -1804,7 +1804,9 @@ drop table t1;
 # underlying tables (BUG#6443)
 #
 set sql_mode='strict_all_tables';
+--disable_warnings
 CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;
+--enable_warnings
 CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
 CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
 -- error 1364
@@ -1860,7 +1862,9 @@ drop table t1;
 #
 # Test for bug #11771: wrong query_id in SELECT * FROM <view>
 #
+--disable_warnings
 CREATE TABLE t1 (f1 char) ENGINE = innodb;
+--enable_warnings
 INSERT INTO t1 VALUES ('A');
 CREATE VIEW  v1 AS SELECT * FROM t1;
 

mysql-test/t/warnings.test

@@ -113,9 +113,9 @@ show variables like 'max_error_count';
 # Test for handler type
 #
 drop table t1;
-create table t1 (id int) engine=isam;
-alter table t1 engine=isam;
-drop table t1;
+#create table t1 (id int) engine=isam;
+#alter table t1 engine=isam;
+#drop table t1;
 
 #
 # Test for deprecated TYPE= syntax