bk commit into 5.0 tree (tomas:1.2423) BUG#25275

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-28 10:10:27+02:00, tomas@stripped +2 -0
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - test case

  mysql-test/r/ndb_single_user.result@stripped, 2007-03-28 10:10:26+02:00,
tomas@stripped +3 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    - test case

  mysql-test/t/ndb_single_user.test@stripped, 2007-03-28 10:10:26+02:00,
tomas@stripped +12 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    - test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.3/mysql-test/r/ndb_single_user.result	2007-03-23 17:14:35 +01:00
+++ 1.4/mysql-test/r/ndb_single_user.result	2007-03-28 10:10:26 +02:00
@@ -53,4 +53,7 @@
 ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode'
from ndbcluster
 COMMIT;
 ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
+create table t2 (a int) engine myisam;
+alter table t2 add column (b int);
+drop table t2;
 drop table t1;

--- 1.2/mysql-test/t/ndb_single_user.test	2007-03-23 17:14:35 +01:00
+++ 1.3/mysql-test/t/ndb_single_user.test	2007-03-28 10:10:26 +02:00
@@ -97,9 +97,21 @@
 --error 1296
 COMMIT;
 
+# Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb
+# tables for other mysqld nodes
+--connection server2
+create table t2 (a int) engine myisam;
+alter table t2 add column (b int);
+
+# exit single user mode
 --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "exit
single user mode" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
 
 # cleanup
+--connection server2
+drop table t2;
 --connection server1
 drop table t1;
+
+# End of 5.0 tests
+