From c8d44bd71822c752f71c3616399a1e28e283f2a1 Mon Sep 17 00:00:00 2001
From: unknown <mskold/marty@mysql.com/linux.site>
Date: Thu, 14 Sep 2006 12:32:49 +0200
Subject: [PATCH] ndb_multi.test:   Removed replication dependency
 ndb_dd_alter.test, ndb_dd_alter.result:   Added innodb dependency and
 regenerated result file ndb_dd_sql_features.result:   Regenerated result file

mysql-test/r/ndb_dd_alter.result:
  Added innodb dependency and regenerated result file
mysql-test/t/ndb_dd_alter.test:
  Added innodb dependency and regenerated result file
mysql-test/r/ndb_dd_sql_features.result:
  Regenerated result file
mysql-test/t/ndb_multi.test:
  Removed replication dependency
---
 mysql-test/r/ndb_dd_alter.result        | 6 +++---
 mysql-test/r/ndb_dd_sql_features.result | 8 ++++----
 mysql-test/t/ndb_dd_alter.test          | 1 +
 mysql-test/t/ndb_multi.test             | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/ndb_dd_alter.result b/mysql-test/r/ndb_dd_alter.result
index 3ae4866b9ef..a9505747a94 100644
--- a/mysql-test/r/ndb_dd_alter.result
+++ b/mysql-test/r/ndb_dd_alter.result
@@ -76,7 +76,7 @@ t1	CREATE TABLE `t1` (
   `a9` varchar(255) DEFAULT NULL,
   `a10` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 SELECT * FROM test.t1 ORDER BY a1;
 a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
 1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
@@ -165,7 +165,7 @@ t1	CREATE TABLE `t1` (
   `a9` varchar(255) DEFAULT NULL,
   `a10` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 SELECT * FROM test.t1 ORDER BY a1;
 a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
 1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
@@ -241,7 +241,7 @@ t1	CREATE TABLE `t1` (
   `a9` varchar(255) DEFAULT NULL,
   `a10` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 ALTER TABLE test.t1 ENGINE=MyISAM;
 SHOW CREATE TABLE test.t1;
 Table	Create Table
diff --git a/mysql-test/r/ndb_dd_sql_features.result b/mysql-test/r/ndb_dd_sql_features.result
index 2cac0ea3942..d1aba2f182e 100644
--- a/mysql-test/r/ndb_dd_sql_features.result
+++ b/mysql-test/r/ndb_dd_sql_features.result
@@ -31,7 +31,7 @@ t1	CREATE TABLE `t1` (
   `a2` varchar(256) DEFAULT NULL,
   `a3` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 SHOW CREATE TABLE test.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -39,7 +39,7 @@ t2	CREATE TABLE `t2` (
   `a2` varchar(256) DEFAULT NULL,
   `a3` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 INSERT INTO test.t1 VALUES (1,'111111','aaaaaaaa');
 INSERT INTO test.t1 VALUES (2,'222222','bbbbbbbb');
 SELECT * FROM test.t1 ORDER BY a1;
@@ -94,7 +94,7 @@ t1	CREATE TABLE `t1` (
   `a2` varchar(5000) DEFAULT NULL,
   `a3` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 SHOW CREATE TABLE test.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -102,7 +102,7 @@ t2	CREATE TABLE `t2` (
   `a2` varchar(5000) DEFAULT NULL,
   `a3` blob,
   PRIMARY KEY (`a1`)
-) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 INSERT INTO test.t1 VALUES (1,@vc1,@d1);
 INSERT INTO test.t1 VALUES (2,@vc2,@b1);
 INSERT INTO test.t1 VALUES (3,@vc3,@d2);
diff --git a/mysql-test/t/ndb_dd_alter.test b/mysql-test/t/ndb_dd_alter.test
index f4b42368c19..4eb76fc1ad6 100644
--- a/mysql-test/t/ndb_dd_alter.test
+++ b/mysql-test/t/ndb_dd_alter.test
@@ -40,6 +40,7 @@
 ##############################################################
 
 -- source include/have_ndb.inc
+-- source include/have_innodb.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test
index 36018e6c679..6ac37a2b25e 100644
--- a/mysql-test/t/ndb_multi.test
+++ b/mysql-test/t/ndb_multi.test
@@ -1,7 +1,6 @@
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
--- source include/have_binlog_format_statement.inc
 
 --disable_warnings
 connection server2;