Post-merge fix.

Author: Alfranio Correia

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

@@ -13,6 +13,10 @@
 # timezone used in CONVERT_TZ is not binlogged. To debug (by Guilhem
 # and possibly Konstantin).
 
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
 --disable_ps_protocol
 
 source include/master-slave.inc;