Commit 8f39ffe3 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/r/ndb_single_user.result:
  manual merge
parents 45d22e80 a6f6c7d5

mysql-test/r/ndb_single_user.result

+3 −0
Original line number Diff line number Diff line
@@ -53,4 +53,7 @@ update t1 set b=b+100 where a=4; 
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;

mysql-test/t/ndb_single_user.test

+12 −0
Original line number Diff line number Diff line
@@ -97,9 +97,21 @@ update t1 set b=b+100 where a=4; 
--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