bzr push into mysql-5.1-telco-7.0 branch (jonas:3011 to 3012)

[Jonas Oreland]

 3012 Jonas Oreland	2009-09-16
      ndb - temporarily disable martins new testcase in mtr to keep other sources of red to creep in while problem is being resolved

    modified:
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
 3011 Magnus Blåudd	2009-09-16 [merge]
      Merge

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2009-09-15 14:10:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2009-09-16 09:23:53 +0000
@@ -756,7 +756,7 @@ INSERT INTO t1 SELECT NULL FROM t1;
 INSERT INTO t1 SELECT NULL FROM t1;
 INSERT INTO t1 SELECT NULL FROM t1;
 SELECT COUNT(*) FROM t1;
---exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup nowait" >> $NDB_TOOLS_OUTPUT
+#--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup nowait" >> $NDB_TOOLS_OUTPUT
 --disable_warnings
 --error 0,762,1296
 ALTER ONLINE TABLE t1 ADD b INT;

Attachment: [text/bzr-bundle] bzr/[e-mail]