bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3980)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/tmp/IJWkkuCPM2/mysql-5.1-telco-7.0/ based on revid:magnus.blaudd@stripped5618-tj51ju0xh40t5zl8

 3980 Magnus Blåudd	2010-11-09 [merge]
      Merge

    renamed:
      mysql-test/std_data/ndb_apply_status.frm => mysql-test/suite/rpl_ndb/t/ndb_apply_status.frm
    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
=== renamed file 'mysql-test/std_data/ndb_apply_status.frm' => 'mysql-test/suite/rpl_ndb/t/ndb_apply_status.frm'
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2010-10-22 15:16:26 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2010-10-28 06:47:47 +0000
@@ -7,7 +7,7 @@
 
 # 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;
+copy_file $MYSQL_TEST_DIR/suite/rpl_ndb/t/ndb_apply_status.frm $MYSQLTEST_VARDIR/master-data/mysql/ndb_apply_status.frm;
 --disable_result_log
 --disable_abort_on_error
 select * from mysql.ndb_apply_status;

No bundle (reason: revision is a merge).