diff --git a/mysql-test/r/ndb_transaction.result b/mysql-test/r/ndb_transaction.result index 886fc0f71a0..405cd1d776a 100644 --- a/mysql-test/r/ndb_transaction.result +++ b/mysql-test/r/ndb_transaction.result @@ -192,26 +192,6 @@ count(*) select count(*) from t4; count(*) 0 -ERROR HY000: Lock wait timeout exceeded; try restarting transaction -select count(*) from t2; -count(*) -0 -select count(*) from t3; -count(*) -0 -select count(*) from t4; -count(*) -0 -ERROR HY000: Lock wait timeout exceeded; try restarting transaction -select count(*) from t2; -count(*) -0 -select count(*) from t3; -count(*) -0 -select count(*) from t4; -count(*) -0 select count(*) from t2; count(*) 100 diff --git a/mysql-test/t/ndb_transaction.test b/mysql-test/t/ndb_transaction.test index 6423f4456c6..4d9d90c21df 100644 --- a/mysql-test/t/ndb_transaction.test +++ b/mysql-test/t/ndb_transaction.test @@ -180,51 +180,6 @@ select count(*) from t2; select count(*) from t3; select count(*) from t4; -# -# insert records into tables and commit after timeout; -# -let $1=100; -disable_query_log; -begin; -while ($1) -{ - eval insert into t2 values($1, $1+9, 5); - eval insert into t3 values($1, $1+9, 5); - eval insert into t4 values($1, $1+9, 5, $1+26000); - dec $1; -} -sleep 15; --- error 1205 -commit; -enable_query_log; - -select count(*) from t2; -select count(*) from t3; -select count(*) from t4; - -# -# insert records into tables and timeout before last operation -# -let $1=100; -disable_query_log; -begin; -while ($1) -{ - eval insert into t2 values($1, $1+9, 5); - eval insert into t3 values($1, $1+9, 5); - eval insert into t4 values($1, $1+9, 5, $1+26000); - dec $1; -} -sleep 15; --- error 1205 -insert into t2 values(10000, 10000, 36000); -commit; -enable_query_log; - -select count(*) from t2; -select count(*) from t3; -select count(*) from t4; - # # insert records into tables and commit; #