bzr commit into mysql-5.1 branch (luis.soares:3113) Bug#42928

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/backport/b42928/mysql-5.1-rep%2B2/ based on
revid:luis.soares@stripped

 3113 Luis Soares	2009-09-29
      BUG#42928: binlog-format setting prevents server from start if binary
      logging is disabled
      
      NOTE: this is the backport to next-mr.
            
      If one sets binlog-format but does NOT enable binary log, server
      refuses to start up. The following messages appears in the error log:
            
      090217 12:47:14 [ERROR] You need to use --log-bin to make
      --binlog-format work.  
      090217 12:47:14 [ERROR] Aborting
            
      This patch addresses this by making the server not to bail out if the
      binlog-format is set without the log-bin option. Additionally, the
      specified binlog-format is stored, in the global system variable
      "binlog_format", and a warning is printed instead of an error.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-09-28 23:04:20 +0000
+++ b/sql/mysqld.cc	2009-09-29 13:40:56 +0000
@@ -3827,9 +3827,10 @@ with --log-bin instead.");
   {
     if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC)
     {
-      sql_print_error("You need to use --log-bin to make "
-                      "--binlog-format work.");
-      unireg_abort(1);
+      sql_print_warning("You need to use --log-bin to make "
+                        "--binlog-format work.");
+
+      global_system_variables.binlog_format= opt_binlog_format_id;
     }
     else
     {


Attachment: [text/bzr-bundle] bzr/[e-mail]