From 558feaa2087397d43a48116743dcdaee9558485e Mon Sep 17 00:00:00 2001
From: He Zhenxing <zhenxing.he@sun.com>
Date: Sun, 15 Nov 2009 11:30:58 +0800
Subject: [PATCH] Postfix after merge

After fix of bug46322, logging to table is turned off, each test
that need this should turn on it in it's opt file.

Add suppression to unsafe statement warnings for binlog_unsafe.test.

mysql-test/suite/binlog/t/binlog_unsafe-master.opt:
  After fix of bug46322, logging to table is turned off, each test that need this should turn on it in it's opt file.
mysql-test/suite/binlog/t/binlog_unsafe.test:
  suppress Unsafe statement warnings
---
 mysql-test/suite/binlog/t/binlog_unsafe-master.opt | 2 +-
 mysql-test/suite/binlog/t/binlog_unsafe.test       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
index 7d8786c156a..78bcdd89270 100644
--- a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
@@ -1 +1 @@
-$UDF_EXAMPLE_LIB_OPT
+$UDF_EXAMPLE_LIB_OPT --log-output=file,table
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test
index 8fb09fe9ab7..34c1dc0cd01 100644
--- a/mysql-test/suite/binlog/t/binlog_unsafe.test
+++ b/mysql-test/suite/binlog/t/binlog_unsafe.test
@@ -96,6 +96,10 @@
 --source include/have_log_bin.inc
 --source include/have_binlog_format_statement.inc
 
+--disable_query_log
+call mtr.add_suppression("Unsafe statement binlogged in statement format");
+--enable_query_log
+
 --echo #### Setup tables ####
 
 CREATE TABLE t0 (a CHAR(100));