bk commit into 5.1 tree (msvensson:1.2582) BUG#28170

[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, 2007-11-01 22:45:31+01:00, msvensson@shellback.(none) +3 -0
  Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status
   - Add test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result@stripped, 2007-11-01 22:45:28+01:00, msvensson@shellback.(none) +20 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result@stripped, 2007-11-01 22:45:28+01:00, msvensson@shellback.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt@stripped, 2007-11-01 22:45:28+01:00, msvensson@shellback.(none) +1 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt''

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt@stripped, 2007-11-01 22:45:28+01:00, msvensson@shellback.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test@stripped, 2007-11-01 22:45:28+01:00, msvensson@shellback.(none) +26 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test''

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test@stripped, 2007-11-01 22:45:28+01:00, msvensson@shellback.(none) +0 -0

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result	2007-11-01 22:45:28 +01:00
@@ -0,0 +1,20 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+*** on slave there should be zero rows ***
+select count(*) from mysql.ndb_apply_status;
+count(*)
+0
+create table t1 (a int key, b int) engine ndb;
+insert into t1 values (1,1);
+*** on master it should be empty ***
+select * from mysql.ndb_apply_status;
+server_id	epoch	log_name	start_pos	end_pos
+*** on slave there should be one row ***
+select count(*) from mysql.ndb_apply_status;
+count(*)
+1
+drop table t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt	2007-11-01 22:45:28 +01:00
@@ -0,0 +1 @@
+--replicate_ignore_db=mysql
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
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2007-11-01 22:45:28 +01:00
@@ -0,0 +1,26 @@
+-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
+
+#
+# Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status
+#
+# Slave is started with --replicate-ignore-db=mysql
+#
+sync_slave_with_master;
+echo *** on slave there should be zero rows ***;
+select count(*) from mysql.ndb_apply_status;
+
+connection master;
+create table t1 (a int key, b int) engine ndb;
+insert into t1 values (1,1);
+echo *** on master it should be empty ***;
+select * from mysql.ndb_apply_status;
+
+sync_slave_with_master;
+echo *** on slave there should be one row ***;
+select count(*) from mysql.ndb_apply_status;
+
+connection master;
+drop table t1;
+sync_slave_with_master;