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

.bzrignore

@@ -284,6 +284,7 @@ libmysqld/password.c
 libmysqld/procedure.cc
 libmysqld/records.cc
 libmysqld/repl_failsafe.cc
+libmysqld/set_var.cc
 libmysqld/simple-test
 libmysqld/slave.cc
 libmysqld/sql_acl.cc
@@ -357,6 +358,8 @@ myisam/myisamlog
 myisam/myisampack
 myisam/test1.MYD
 myisam/test1.MYI
+myisam/test2.MYD
+myisam/test2.MYI
 mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
 mysql-4.0.2-alpha.tar.gz
 mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
@@ -424,6 +427,12 @@ sql-bench/copy-db
 sql-bench/crash-me
 sql-bench/gif/*
 sql-bench/graph-compare-results
+sql-bench/innotest1
+sql-bench/innotest1a
+sql-bench/innotest1b
+sql-bench/innotest2
+sql-bench/innotest2a
+sql-bench/innotest2b
 sql-bench/output/*
 sql-bench/run-all-tests
 sql-bench/server-cfg
@@ -485,12 +494,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-sql-bench/innotest1
-sql-bench/innotest1a
-sql-bench/innotest1b
-sql-bench/innotest2
-sql-bench/innotest2a
-sql-bench/innotest2b
-myisam/test2.MYD
-myisam/test2.MYI
-libmysqld/set_var.cc

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);