bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:3507) Bug#31853

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.1-telco-7.0/

 3507 Martin Skold	2010-04-27 [merge]
      Merge
      modified:
        mysql-test/suite/ndb/r/ndb_disconnect_ddl.result
        mysql-test/suite/ndb/t/ndb_disconnect_ddl.test

=== modified file 'mysql-test/suite/ndb/r/ndb_disconnect_ddl.result'
--- a/mysql-test/suite/ndb/r/ndb_disconnect_ddl.result	2010-04-26 10:39:15 +0000
+++ b/mysql-test/suite/ndb/r/ndb_disconnect_ddl.result	2010-04-27 10:36:04 +0000
@@ -1,10 +1,7 @@
 DROP TABLE IF EXISTS t1;
 "testing the bug#31853"
-use test;
 create table t1(i int primary key) engine=ndb;
+ERROR HY000: Can't create table 'test.t1' (errno: 157)
 create table t2(i int primary key) engine=ndb;
 ERROR HY000: Can't create table 'test.t2' (errno: 157)
-create table t3(i int primary key) engine=ndb;
-ERROR HY000: Can't create table 'test.t3' (errno: 157)
-drop table t1;
 "end of test the bug#31853"

=== modified file 'mysql-test/suite/ndb/t/ndb_disconnect_ddl.test'
--- a/mysql-test/suite/ndb/t/ndb_disconnect_ddl.test	2010-04-26 10:39:15 +0000
+++ b/mysql-test/suite/ndb/t/ndb_disconnect_ddl.test	2010-04-27 10:36:04 +0000
@@ -11,22 +11,19 @@ call mtr.add_suppression("Could not acqu
 call mtr.add_suppression("Tables not available after 60 seconds.");
 enable_query_log;
 
-use test;
-create table t1(i int primary key) engine=ndb;
-
 # Restart cluster nodes "nostart"
 --exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all restart -n" >> $NDB_TOOLS_OUTPUT
 # Wait for all nodes to enter "nostart"
 --exec $NDB_WAITER --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" --not-started >> $NDB_TOOLS_OUTPUT
 
 --error ER_CANT_CREATE_TABLE
-create table t2(i int primary key) engine=ndb;
+create table t1(i int primary key) engine=ndb;
 
 let $mysqld_name=mysqld.1.1;
 --source include/restart_mysqld.inc
 
 --error ER_CANT_CREATE_TABLE
-create table t3(i int primary key) engine=ndb;
+create table t2(i int primary key) engine=ndb;
 
 # Start cluster nodes again
 --exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all start" >> $NDB_TOOLS_OUTPUT
@@ -45,7 +42,4 @@ connection default;
 --enable_result_log
 --enable_query_log
 
-# cleanup
-drop table t1;
-
 --echo "end of test the bug#31853"