bk commit into 5.1 tree (mats:1.2536) BUG#28752

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-02 21:01:30+02:00, mats@stripped +1 -0
  BUG#28752 (binlog_format variable is empty when binlog is turned off):
  Setting MIXED format instead of UNSPECIFIED format when server is
  started without log-bin.

  sql/mysqld.cc@stripped, 2007-06-02 21:01:24+02:00, mats@stripped +1 -1
    Setting MIXED format instead of UNSPECIFIED format when server is
    started without log-bin.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	kindahl-laptop.dnsalias.net
# Root:	/home/bk/b28752-mysql-5.1-rpl

--- 1.647/sql/mysqld.cc	2007-06-02 21:01:41 +02:00
+++ 1.648/sql/mysqld.cc	2007-06-02 21:01:41 +02:00
@@ -3295,7 +3295,7 @@
   }
     else
   {
-      global_system_variables.binlog_format= BINLOG_FORMAT_UNSPEC;
+      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
     }
   else
     if (opt_binlog_format_id == BINLOG_FORMAT_UNSPEC)