From 5e3725bf481cc0d94b47413e15f635db8cc4b99c Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Fri, 2 Nov 2007 13:07:14 +0100
Subject: [PATCH] Bug#28170 replicate-ignore-db=mysql should not ignore
 mysql.ndb_apply_status  - Add test case --- Bug#28170
 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status  - Add
 test case

---
 mysql-test/r/bdb_notembedded.result           | 35 +++++++++++++++++
 .../rpl_ndb/r/rpl_ndb_apply_status.result     | 20 ++++++++++
 .../rpl_ndb/t/rpl_ndb_apply_status-master.opt |  1 +
 .../suite/rpl_ndb/t/rpl_ndb_apply_status.test | 26 +++++++++++++
 mysql-test/t/bdb_notembedded.test             | 38 +++++++++++++++++++
 5 files changed, 120 insertions(+)
 create mode 100644 mysql-test/r/bdb_notembedded.result
 create mode 100644 mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
 create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt
 create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
 create mode 100644 mysql-test/t/bdb_notembedded.test

diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result
new file mode 100644
index 00000000000..14cb5fad915
--- /dev/null
+++ b/mysql-test/r/bdb_notembedded.result
@@ -0,0 +1,35 @@
+set autocommit=1;
+reset master;
+create table bug16206 (a int);
+insert into bug16206 values(1);
+start transaction;
+insert into bug16206 values(2);
+commit;
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
+f	n	Query	1	n	use `test`; create table bug16206 (a int)
+f	n	Query	1	n	use `test`; insert into bug16206 values(1)
+f	n	Query	1	n	use `test`; insert into bug16206 values(2)
+drop table bug16206;
+reset master;
+create table bug16206 (a int) engine=         bdb;
+insert into bug16206 values(0);
+insert into bug16206 values(1);
+start transaction;
+insert into bug16206 values(2);
+commit;
+insert into bug16206 values(3);
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
+f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb
+f	n	Query	1	n	use `test`; insert into bug16206 values(0)
+f	n	Query	1	n	use `test`; insert into bug16206 values(1)
+f	n	Query	1	n	use `test`; BEGIN
+f	n	Query	1	n	use `test`; insert into bug16206 values(2)
+f	n	Query	1	n	use `test`; COMMIT
+f	n	Query	1	n	use `test`; insert into bug16206 values(3)
+drop table bug16206;
+set autocommit=0;
+End of 5.0 tests
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
new file mode 100644
index 00000000000..0fcd361da21
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
@@ -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 --git 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
new file mode 100644
index 00000000000..3f4aff8a321
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt
@@ -0,0 +1 @@
+--replicate_ignore_db=mysql
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
new file mode 100644
index 00000000000..cc74acc6490
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
@@ -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;
diff --git a/mysql-test/t/bdb_notembedded.test b/mysql-test/t/bdb_notembedded.test
new file mode 100644
index 00000000000..24e64ebbfb2
--- /dev/null
+++ b/mysql-test/t/bdb_notembedded.test
@@ -0,0 +1,38 @@
+-- source include/not_embedded.inc
+-- source include/have_bdb.inc
+
+#
+# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode
+#
+set autocommit=1;
+
+let $VERSION=`select version()`;
+
+reset master;
+create table bug16206 (a int);
+insert into bug16206 values(1);
+start transaction;
+insert into bug16206 values(2);
+commit;
+--replace_result $VERSION VERSION
+--replace_column 1 f 2 n 5 n
+show binlog events;
+drop table bug16206;
+
+reset master;
+create table bug16206 (a int) engine=         bdb;
+insert into bug16206 values(0);
+insert into bug16206 values(1);
+start transaction;
+insert into bug16206 values(2);
+commit;
+insert into bug16206 values(3);
+--replace_result $VERSION VERSION
+--replace_column 1 f 2 n 5 n
+show binlog events;
+drop table bug16206;
+
+set autocommit=0;
+
+
+--echo End of 5.0 tests