removed shaky test case

2 files changed, 20 insertions, 34 deletions

diff --git a/mysql-test/r/ndb_alter_table.result b/mysql-test/r/ndb_alter_table.result
index 75b52848a86..f55f680e972 100644
--- a/mysql-test/r/ndb_alter_table.result
+++ b/mysql-test/r/ndb_alter_table.result
@@ -72,17 +72,3 @@ col6	col1	col3	fourth	col4	col4_5	col5	col7	col8
 1	101	3	4	5		PENDING		0000-00-00 00:00:00
 2	102	4	3	5	99	PENDING	EXTRA	2004-01-01 00:00:00
 drop table t1;
-DROP TABLE IF EXISTS t2;
-create table t2 (a int NOT NULL PRIMARY KEY) engine=myisam;
-alter table t2 engine=ndbcluster;
-alter table t2 add c int;
-delete from t2;
-ERROR HY000: Got temporary error 1217 '1217' from ndbcluster
-select count(*) from t2 where a+0 > 0;
-count(*)
-12001
-truncate table t2;
-select count(*) from t2;
-count(*)
-0
-drop table t2;
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test
index 793dfd177cd..f3b1de6f1e6 100644
--- a/mysql-test/t/ndb_alter_table.test
+++ b/mysql-test/t/ndb_alter_table.test
@@ -48,25 +48,25 @@ show table status;
 select * from t1 order by col1;
 drop table t1;
 
---disable_warnings
-DROP TABLE IF EXISTS t2;
---enable_warnings
+#--disable_warnings
+#DROP TABLE IF EXISTS t2;
+#--enable_warnings
 
-create table t2 (a int NOT NULL PRIMARY KEY) engine=myisam;
-let $1=12001;
-disable_query_log;
-while ($1)
-{
- eval insert into t2 values($1);
- dec $1;
-}
-enable_query_log;
-alter table t2 engine=ndbcluster;
-alter table t2 add c int;
---error 1297
-delete from t2;
+#create table t2 (a int NOT NULL PRIMARY KEY) engine=myisam;
+#let $1=12001;
+#disable_query_log;
+#while ($1)
+#{
+# eval insert into t2 values($1);
+# dec $1;
+#}
+#enable_query_log;
+#alter table t2 engine=ndbcluster;
+#alter table t2 add c int;
+#--error 1297
+#delete from t2;
 #to make sure we do a full table scan
-select count(*) from t2 where a+0 > 0;
-truncate table t2;
-select count(*) from t2;
-drop table t2;
+#select count(*) from t2 where a+0 > 0;
+#truncate table t2;
+#select count(*) from t2;
+#drop table t2;