bzr commit into mysql-6.0-bugteam branch (marc.alff:2748) Bug#10143

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-10143/

 2748 Marc Alff	2008-08-06
      Bug#10143
      
      Fixed the test result for ndb_basic, which is using perror.
modified:
  mysql-test/suite/ndb/r/ndb_basic.result

=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2007-11-12 12:25:34 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2008-08-06 22:16:07 +0000
@@ -783,6 +783,7 @@ f1	f2	f3
 222222	bbbbbb	2
 drop table t1;
 Illegal ndb error code: 1186
+MySQL error code 1186 (ER_FLUSH_MASTER_BINLOG_CLOSED): Binlog closed, cannot RESET MASTER
 CREATE TABLE t1 (
 a VARBINARY(40) NOT NULL,
 b VARCHAR (256) CHARACTER SET UTF8 NOT NULL,