bk commit into 5.1 tree (bar:1.2035) BUG#20914

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar 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, 2006-07-27 12:44:14+05:00, bar@stripped +1 -0
  Bug#20914 SHOW VARIABLES crashes server

  sql/mysqld.cc@stripped, 2006-07-27 12:44:08+05:00, bar@stripped +2 -2
    Backporting bug fix from the latest 5.1.
    Problem: binglog_format was left unspecified if
    no row based replication was compiled, which
    lead "show variables" to crash when trying to
    display binlog_format textual value.
    Fix: initializing binlog_format to BF_STMT.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-wl2325-5.0

--- 1.488/sql/mysqld.cc	2006-07-27 12:44:26 +05:00
+++ 1.489/sql/mysqld.cc	2006-07-27 12:44:26 +05:00
@@ -2901,10 +2901,10 @@
                       "--binlog-format work.");
     unireg_abort(1);
   }
-  if (opt_bin_log && opt_binlog_format_id == BF_UNSPECIFIED)
+  if (opt_binlog_format_id == BF_UNSPECIFIED)
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
-    if (have_ndbcluster == SHOW_OPTION_YES)
+    if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES)
     {
       opt_binlog_format_id= BF_ROW;
     }