bk commit into 5.1 tree (msvensson:1.2597) BUG#36123

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-20 12:18:38+02:00, msvensson@pilot.(none) +1 -0
  Bug#36123 Selecting from mysql.ndb_apply_status leads to failure
   - Fix testcase

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test@stripped, 2008-05-20 12:18:36+02:00,
msvensson@pilot.(none) +2 -0
    Ignore copy file failed error, the file might already have been
    created by mysqld

diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2008-05-09 11:42:16 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2008-05-20 12:18:36 +02:00
@@ -5,6 +5,8 @@
 # Load the mysql.ndb_apply_status table into table def cache
 #
 
+# The table might already have been created by mysqld -> ignore error
+--error 0,1
 copy_file $MYSQL_TEST_DIR/std_data/ndb_apply_status.frm
$MYSQLTEST_VARDIR/master-data/mysql/ndb_apply_status.frm;
 --disable_result_log
 --disable_abort_on_error