misc test/result fixes

mysql-test/include/rpl_udf.inc:
  supppression should be added after master-slave.inc to affect both a master and a slave
mysql-test/suite/rpl/t/rpl_udf.test:
  supppression should be added after master-slave.inc to affect both a master and a slave

mysql-test/include/rpl_udf.inc

@@ -11,6 +11,10 @@
 --source include/have_udf.inc
 --source include/master-slave.inc
 
+disable_query_log;
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+enable_query_log;
+
 #
 # To run this tests the "sql/udf_example.c" need to be compiled into
 # udf_example.so and LD_LIBRARY_PATH should be setup to point out where

mysql-test/suite/innodb/t/mdev-117.test

@@ -18,11 +18,11 @@ SELECT col_int_key FROM t1;
 --send DELETE IGNORE FROM t1;
 
 --connection con1
---error 0,1213
+--error 0,ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
 DELETE FROM t1 WHERE col_int_key IN (1, 40000000);
 
 --connection default
---error 0,1213
+--error 0,ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
 --reap 
 
 --disconnect con1

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

@@ -5,10 +5,6 @@
 # statement based format. This tests work completed in WL#3629.   #
 ###################################################################
 
-disable_query_log;
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-enable_query_log;
-
 let $engine_type= MyISAM;
 --source include/rpl_udf.inc