Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl

mysql-test/include/ndb_not_readonly.inc

@@ -2,9 +2,9 @@
 #
 # wait for server to connect properly to cluster
 #
---error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
 set @saved_log = @@sql_log_bin;
 set sql_log_bin = 0;
+--error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
 delete from mysql.ndb_apply_status where server_id=0;
 let $mysql_errno= 1;
 let $counter= 600;