bzr commit into mysql-5.1-bugteam branch (gni:2793) Bug#41980

[Guangbao Ni]

#At file:///home/ngb/mysql/bzr/bugteam-5.1-bug41980/

 2793 Guangbao Ni	2009-02-11
      BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 !
modified:
  sql/sql_class.cc

per-file messages:
  sql/sql_class.cc
    Add a condition (sql_bin_log=on) for if statement. then print a warning when it is in statement mode and trying to log an unsafe statement.
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2009-02-06 09:53:20 +0000
+++ b/sql/sql_class.cc	2009-02-11 19:12:57 +0000
@@ -3657,7 +3657,8 @@ int THD::binlog_query(THD::enum_binlog_q
     If we are in statement mode and trying to log an unsafe statement,
     we should print a warning.
   */
-  if (lex->is_stmt_unsafe() &&
+  if ((options & OPTION_BIN_LOG) &&
+      lex->is_stmt_unsafe() &&
       variables.binlog_format == BINLOG_FORMAT_STMT)
   {
     DBUG_ASSERT(this->query != NULL);