From cbdc730ae50aa5363dab071fe958608d8b223766 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Apr 2006 12:21:33 +0300 Subject: Fixed timeing problem by ignoring failures and results from first select after table definition change mysql-test/r/ndb_alter_table2.result: Fixed timeing problem by ignoring failures and results from first select after table definition changethe mysql-test/r/ndb_alter_table_stm.result: Fixed timeing problem by ignoring failures and results from first select after table definition changethe --- mysql-test/r/ndb_alter_table2.result | 1 - mysql-test/r/ndb_alter_table_stm.result | 1 + mysql-test/t/ndb_alter_table2.test | 3 +++ mysql-test/t/ndb_alter_table_stm.test | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/ndb_alter_table2.result b/mysql-test/r/ndb_alter_table2.result index 0d2e2289f91..3783c76447c 100644 --- a/mysql-test/r/ndb_alter_table2.result +++ b/mysql-test/r/ndb_alter_table2.result @@ -28,7 +28,6 @@ b INT NOT NULL, c INT NOT NULL ) ENGINE=ndbcluster; select * from t1; -a b c select * from t1; a b c select * from t1; diff --git a/mysql-test/r/ndb_alter_table_stm.result b/mysql-test/r/ndb_alter_table_stm.result index 9c1d09a8970..7cb7b990e2c 100644 --- a/mysql-test/r/ndb_alter_table_stm.result +++ b/mysql-test/r/ndb_alter_table_stm.result @@ -8,6 +8,7 @@ a b c 2 two two alter table t1 drop index c; select * from t1 where c = 'two'; +select * from t1 where c = 'two'; a b c 2 two two drop table t1; diff --git a/mysql-test/t/ndb_alter_table2.test b/mysql-test/t/ndb_alter_table2.test index 4464f37a030..afe6e44f698 100644 --- a/mysql-test/t/ndb_alter_table2.test +++ b/mysql-test/t/ndb_alter_table2.test @@ -72,7 +72,10 @@ CREATE TABLE t1 ( connection server1; +--disable_result_log +--error 0,1412 select * from t1; +--enable_result_log select * from t1; select * from t1; select * from t1; diff --git a/mysql-test/t/ndb_alter_table_stm.test b/mysql-test/t/ndb_alter_table_stm.test index 2c52b542b12..bf162dd0d50 100644 --- a/mysql-test/t/ndb_alter_table_stm.test +++ b/mysql-test/t/ndb_alter_table_stm.test @@ -17,6 +17,12 @@ select * from t1 where c = 'two'; connection server1; alter table t1 drop index c; connection server2; + +--disable_result_log +--error 0,1412 +select * from t1 where c = 'two'; +--enable_result_log + select * from t1 where c = 'two'; connection server1; drop table t1; -- cgit v1.2.1