BUG#44661: automerge local 5.1-bt bug branch --> local 5.1-bt up to date

mysql-test/extra/rpl_tests/rpl_failed_optimize.test

@@ -22,3 +22,4 @@ connection master;
 select * from t1;
 commit;
 drop table t1;
+-- sync_slave_with_master

mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result

@@ -102,3 +102,4 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+DROP TABLE t1;

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test

@@ -58,3 +58,4 @@ STOP SLAVE;
 # cleanup
 --connection master
 DROP TABLE t1;
+-- sync_slave_with_master

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test

@@ -78,3 +78,7 @@ SELECT * FROM t1 ORDER BY a;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 query_vertical SHOW SLAVE STATUS;
+
+-- connection master
+DROP TABLE t1;
+-- sync_slave_with_master