merge with 3.23

BitKeeper/etc/ignore:
  auto-union
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_rotate_logs-master.opt:
  Auto merged
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
  Auto merged
mysql-test/t/rpl_rotate_logs-slave.sh:
  Auto merged

mysql-test/t/rpl000018.test

@@ -1,3 +1,8 @@
+#
+# Running test with abort-slave-event-count=1
+# This will force slave to reconnect after every event
+#
+
 require_manager;
 connect (master,localhost,root,,test,0,master.sock);
 connect (slave,localhost,root,,test,0,slave.sock);