Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bk/w3339-mysql-5.1-rpl

mysql-test/r/check.result

-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);

mysql-test/t/check.test

@@ -2,7 +2,8 @@ connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
 connection con1;
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1,t2;
+drop view if exists v1;
 --enable_warnings
 
 # Add a lot of keys to slow down check

mysql-test/t/func_misc.test

@@ -89,7 +89,9 @@ select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
 #
 # Test for BUG#9535
 #
+--disable_warnings
 create table t1 as select uuid(), length(uuid());
+--enable_warnings
 show create table t1;
 drop table t1;
 

sql/sql_class.cc

@@ -2873,22 +2873,12 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
     if (int error= binlog_flush_pending_rows_event(TRUE))
       DBUG_RETURN(error);
 
-  switch (qtype) {
-  case THD::ROW_QUERY_TYPE:
-    if (current_stmt_binlog_row_based)
-      DBUG_RETURN(0);
-    /* Otherwise, we fall through */
-  case THD::MYSQL_QUERY_TYPE:
   /*
-      Using this query type is a conveniece hack, since we have been
-      moving back and forth between using RBR for replication of
-      system tables and not using it.
-
-      Make sure to change in check_table_binlog_row_based() according
-      to how you treat this.
+    If we are in statement mode and trying to log an unsafe statement,
+    we should print a warning.
   */
-  case THD::STMT_QUERY_TYPE:
-    if (lex->is_stmt_unsafe())
+  if (lex->is_stmt_unsafe() &&
+      variables.binlog_format == BINLOG_FORMAT_STMT)
   {
     DBUG_ASSERT(this->query != NULL);
     push_warning(this, MYSQL_ERROR::WARN_LEVEL_WARN,
@@ -2896,7 +2886,6 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
                  ER(ER_BINLOG_UNSAFE_STATEMENT));
     if (!(binlog_flags & BINLOG_FLAG_UNSAFE_STMT_PRINTED))
     {
-        
       char warn_buf[MYSQL_ERRMSG_SIZE];
       my_snprintf(warn_buf, MYSQL_ERRMSG_SIZE, "%s Statement: %s",
                   ER(ER_BINLOG_UNSAFE_STATEMENT), this->query);
@@ -2905,6 +2894,21 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
     }
   }
 
+  switch (qtype) {
+  case THD::ROW_QUERY_TYPE:
+    if (current_stmt_binlog_row_based)
+      DBUG_RETURN(0);
+    /* Otherwise, we fall through */
+  case THD::MYSQL_QUERY_TYPE:
+    /*
+      Using this query type is a conveniece hack, since we have been
+      moving back and forth between using RBR for replication of
+      system tables and not using it.
+
+      Make sure to change in check_table_binlog_row_based() according
+      to how you treat this.
+    */
+  case THD::STMT_QUERY_TYPE:
     /*
       The MYSQL_LOG::write() function will set the STMT_END_F flag and
       flush the pending rows event if necessary.