Merge eel.(none):/home/jonas/src/mysql-4.1

into  eel.(none):/home/jonas/src/mysql-4.1-push


mysql-test/t/ndb_config.test:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  merge

1 files changed, 24 insertions, 1 deletions

diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test
index 65384a339e2..b5b73ad1998 100644
--- a/mysql-test/t/ndb_alter_table.test
+++ b/mysql-test/t/ndb_alter_table.test
@@ -147,7 +147,6 @@ select * from t1 where b = 'two';
 connection server1;
 alter table t1 drop index c;
 connection server2;
---error 1105
 select * from t1 where b = 'two';
 select * from t1 where b = 'two';
 connection server1;
@@ -176,4 +175,28 @@ drop table t1;
 #select count(*) from t2;
 #drop table t2;
 
+connection server1;
+create table t3 (a int primary key) engine=ndbcluster;
+
+connection server2;
+begin;
+insert into t3 values (1);
+
+connection server1;
+alter table t3 rename t4;
+
+connection server2;
+# This should work as transaction is ongoing...
+delete from t3;
+insert into t3 values (1);
+commit; 
+
+# This should fail as its a new transaction
+--error 1015
+select * from t3;
+select * from t4;
+drop table t4;
+show tables;
+connection server1;
+
 # End of 4.1 tests