I fixed the bug too and had to merge conflicts

myisammrg/myrg_open.c:
  merged

3 files changed, 23 insertions, 0 deletions

diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
new file mode 100644
index 00000000000..d5716a82c24
--- /dev/null
+++ b/mysql-test/r/rpl000016.result
@@ -0,0 +1,3 @@
+s	
+Could not break slave	
+Tried hard	
diff --git a/mysql-test/t/rpl000016-slave-master-info.opt b/mysql-test/t/rpl000016-slave-master-info.opt
new file mode 100644
index 00000000000..80190bf6d29
--- /dev/null
+++ b/mysql-test/t/rpl000016-slave-master-info.opt
@@ -0,0 +1 @@
+--server-id=2
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
new file mode 100644
index 00000000000..6a89797af8a
--- /dev/null
+++ b/mysql-test/t/rpl000016.test
@@ -0,0 +1,19 @@
+connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
+connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
+system cat /dev/null > var/slave-data/master.info;
+system chmod 000 var/slave-data/master.info;
+connection slave;
+!slave start;
+system chmod 600 var/slave-data/master.info;
+!slave start;
+!change master to master_host='127.0.0.1',master_port=9306,master_user='root'; 
+reset slave;
+!change master to master_host='127.0.0.1',master_port=9306,master_user='root'; 
+slave start;
+connection master;
+drop table if exists foo;
+create table foo(s text);
+insert into foo values('Could not break slave'),('Tried hard');
+connection slave;
+sleep 0.3;
+select * from foo;