database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

BUG#44663 Unused replication options prevent server from starting.

Browse Source 
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.
This commit is contained in:
Alfranio Correia
2009-09-29 14:38:32 +01:00
parent 3f41ba790e
commit f940fe75cc
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/mysqld.cc
View File

@@ -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,12 +3850,18 @@ 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
if (opt_bin_log) if (opt_bin_log)