diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-09-29 14:38:32 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-09-29 14:38:32 +0100 |
| commit | 569ca8590c76e75a06d3ec2f320b7ea2b6960072 (patch) | |
| tree | e90ac4d5f20398f286937556fc83351b5acc0df7 /sql | |
| parent | d94e279c7ce6953f50f033278a385ab8633526ce (diff) | |
| download | mariadb-git-569ca8590c76e75a06d3ec2f320b7ea2b6960072.tar.gz | |
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9b70096eb73..a57ee04081f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3819,9 +3819,8 @@ with --log-bin instead."); } 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."); - unireg_abort(1); } if (!opt_bin_log) { @@ -3851,11 +3850,17 @@ with --log-bin instead."); #ifdef HAVE_REPLICATION if (opt_log_slave_updates && replicate_same_server_id) { - sql_print_error("\ -using --replicate-same-server-id in conjunction with \ + if (opt_bin_log) + { + sql_print_error("using --replicate-same-server-id in conjunction with \ --log-slave-updates is impossible, it would lead to infinite loops in this \ 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 |