bzr commit into mysql-5.1-bugteam branch (alfranio.correia:2914) Bug#44663

[Alfranio Correia]

#At
file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-44663/mysql-5.1-bugteam/
based on revid:azundris@stripped

 2914 Alfranio Correia	2009-07-03
      BUG#44663 Unused replication options prevent server from starting.
      
      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.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-05-15 12:57:51 +0000
+++ b/sql/mysqld.cc	2009-07-03 18:27:26 +0000
@@ -3800,9 +3800,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)
   {
@@ -3832,11 +3831,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
 


Attachment: [text/bzr-bundle]