Commit cf989936 authored by Alfranio Correia's avatar Alfranio Correia

BUG#44663 Unused replication options prevent server from starting.

NOTE: Backporting the patch to next-mr.
            
The use of option log_slave_updates without log_bin was preventing the server
from starting. To fix the problem, we replaced the error message and the exit
call by a warning message.
parent c02813ba
...@@ -3819,9 +3819,8 @@ with --log-bin instead."); ...@@ -3819,9 +3819,8 @@ with --log-bin instead.");
} }
if (opt_log_slave_updates && !opt_bin_log) if (opt_log_slave_updates && !opt_bin_log)
{ {
sql_print_error("You need to use --log-bin to make " sql_print_warning("You need to use --log-bin to make "
"--log-slave-updates work."); "--log-slave-updates work.");
unireg_abort(1);
} }
if (!opt_bin_log) if (!opt_bin_log)
{ {
...@@ -3851,11 +3850,17 @@ with --log-bin instead."); ...@@ -3851,11 +3850,17 @@ with --log-bin instead.");
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
if (opt_log_slave_updates && replicate_same_server_id) if (opt_log_slave_updates && replicate_same_server_id)
{ {
sql_print_error("\ if (opt_bin_log)
using --replicate-same-server-id in conjunction with \ {
sql_print_error("using --replicate-same-server-id in conjunction with \
--log-slave-updates is impossible, it would lead to infinite loops in this \ --log-slave-updates is impossible, it would lead to infinite loops in this \
server."); server.");
unireg_abort(1); unireg_abort(1);
}
else
sql_print_warning("using --replicate-same-server-id in conjunction with \
--log-slave-updates would lead to infinite loops in this server. However this \
will be ignored as the --log-bin option is not defined.");
} }
#endif #endif
......
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