Commit a11e2137 authored by Luis Soares's avatar Luis Soares

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.
parent bdacc562
...@@ -3827,9 +3827,10 @@ with --log-bin instead."); ...@@ -3827,9 +3827,10 @@ with --log-bin instead.");
{ {
if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC) if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC)
{ {
sql_print_error("You need to use --log-bin to make " sql_print_warning("You need to use --log-bin to make "
"--binlog-format work."); "--binlog-format work.");
unireg_abort(1);
global_system_variables.binlog_format= opt_binlog_format_id;
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment