WL#3339 (Issue warnings when statement-based replication may fail):

Fixing case where a false warning could be printed in mixed mode.
Also fixing some test cases that generated different result files as
a consequence of the patch.


mysql-test/r/check.result:
  Result change.
mysql-test/t/check.test:
  Dropping all views created in the test before trying to execute test.
mysql-test/t/func_misc.test:
  Disabling warning for unsafe statement since test is not concerned with
  this and there are tests that test this.
sql/sql_class.cc:
  Moving code to print warning for unsafe statement to look at logging
  *mode* instead of logging *format*. The latter one can print a false
  warning when executing in mixed mode and part of the statement is
  written in statement format (i.e., CREATE-SELECT).

1 files changed, 2 insertions, 1 deletions

diff --git a/mysql-test/r/check.result b/mysql-test/r/check.result
index 60806e7393e..739eab2ed76 100644
--- a/mysql-test/r/check.result
+++ b/mysql-test/r/check.result
@@ -1,4 +1,5 @@
-drop table if exists t1;
+drop table if exists t1,t2;
+drop view if exists v1;
 create table t1(n int not null, key(n), key(n), key(n), key(n));
 check table t1 extended;
 insert into t1 values (200000);