Update rpl.binlog_trx_metadata_leak_fix

Summary:
Test fails sometimes with warnings on purge log failing due to active
reader (likely slave thread still catching up). Update test so that the
slave is sync'ed to master before purge.

Squash with D14652380

Reviewed By: luqun

Differential Revision: D18662836

fbshipit-source-id: 54b4c80

mysql-test/suite/rpl/r/binlog_trx_metadata_leak_fix.result

@@ -3,7 +3,11 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
+include/sync_slave_sql_with_master.inc
+[connection master]
 flush logs;
+include/sync_slave_sql_with_master.inc
+[connection master]
 purge binary logs to 'binlog';
 flush logs;
 purge binary logs to 'binlog';

mysql-test/suite/rpl/t/binlog_trx_metadata_leak_fix.test

@@ -2,7 +2,11 @@ source include/master-slave.inc;
 
 # Cleanup old binlog
 connection master;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
 flush logs;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
 let $binlog= query_get_value(SHOW MASTER STATUS, File, 1);
 replace_result $binlog binlog;
 eval purge binary logs to '$binlog';