From: Date: July 3 2009 8:27pm
Subject: bzr commit into mysql-5.1-bugteam branch (alfranio.correia:2914)
 Bug#44663
List-Archive: http://lists.mysql.com/commits/77940
X-Bug: 44663
Message-Id: <0KM700FGCXXXWK30@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_3cKQucLGv5lJos19Rp9DuA)"

--Boundary_(ID_3cKQucLGv5lJos19Rp9DuA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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
 


--Boundary_(ID_3cKQucLGv5lJos19Rp9DuA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/alfranio.correia@stripped";
 name*1=726-kx8ee920t15olqjd.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/alfranio.correia@stripped";
 filename*1=726-kx8ee920t15olqjd.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@stripped\
#   kx8ee920t15olqjd
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-44663/mysql-5.1-bugteam/
# testament_sha1: a67a80a213a1da1d5c5a2b8c4937dd0bb1b6b2d8
# timestamp: 2009-07-03 19:27:31 +0100
# base_revision_id: azundris@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXCMB8cAAfTfgFAQWWf//3rA
BiS////6UAUGT1blbJNunZLNdISSjJomJMmDJkJ6U/KYoDyE0yA0eoJSTKejEYhDJAADQaBoAABJ
FNoRDQTTUeQmankmm1M1APSGmmj0hzAATJgATCYJhDAEYAEkiZTTABJqflTaeUniMhNBkAAFLgO2
nPZN364/Pw+Rq6116ZuvPZTSoDLSzpdsbgey/TBT+WujaLTLCfUAoAU83+MZ5FR5WszI+/2VWZ+L
S3CR0jZmmxnnQsp0dJb4HlxzdXiZVlkQ13jnOiVqunFsrXnFNF1fO6lfW1ZwQYLFOzBHkQPM44bb
pkO2K7ml3sXHs1/z3c+7jdsod2cmu3eIo7tsf0YQx625rLG2RkXHZhB5wY0ErhF5MQ310HAXROOE
kZ7gl0xa1WOxM91U8HLeY0wr0rx3bHzRq1xQMza24ZlsR4iQeU5ZebiQlE6LXiIGA4F7ytw0sC9j
lSLIE7FDNdfO+kMuPK8wm0fK4aQh1inTqJhbtDWQ2OMyExifoLpmw2ypFQoT5mm4pi2Fl6gLTkIL
StIMLFjCpn1EiiJGAisgVpi2tApYjRSNS+Vl86HlRImQ176x0qEkuJcWH2lNMbiKT0VFg+3cc3RQ
k01QMyQLp5y8owGxEfneTFa6zsNdRY4I51x0zbEZRTLK4Bbfv0FDEq4U5QtMRiRtpkpBxiixFhOD
zKPa4cUG+Ioyxgt40Rc+CmE4vMFEeOnIEkjJ80GK1I8lCHkdZl3G5hfVjDsvKG3t0KcDrZ+Dd9LI
coz2OunWwrJYmGZr/3ss83dudqMt5mMSa4T7U1/xjI1KOb7c5QNpJL0404zFIYhl8ci9NP3yymBd
Nda4BsqhdyiNGtTm4a09FvrJXOgcTnxOBRKPPExN9t1MJdEqV4DG2oeVkNSyHWuw33+pYKXycokX
pkoOB7CDS5KjwtjwrMpjomTp6izliwXWELaaNJ1cOp4cv79cSoxYaz0rWuo2DsS9moYYCLOa6sgZ
NJGwYEaJM5eC9ToXCToasyxWciCgsPdU+RgZAwoQppy45A9EhtL9iJJzFgJoJ8NejcmVS52lZaOH
qUydv17uwktiyHGDnKsBtXO44xE4GJnHabwJK7Pxy7OnQ8sDeSA3B6P7c5XoYuA06E1tuw3ivlOP
ExygHCJIuTMrgg+zAq1MMRjXh00rQCtUMkz9smqtIG2L12YoLtFhwFpqcx3Td9YWlgsKCdFKeRJ0
ZdGtoaLPbGlKme0KKFKsBUX48rk5hE0lSiCI6bKTPqlwlqMWfz9l4ZijEwwzMmOUBhO2Q3YYGgHU
PDCJTwJwJymb6Y3pLkmzDAzI4Ou4o/w606XLasEjSLuFI1AqIW5yJ7kY+UyjJgvpXT+zpWb4KE/X
l8OvINGQwwvU+0kKA56ZhbGM5yTUUDTdIweJot9f0jmK9IrfYTWucwmDHcA63TMDUK+sacv9j8GT
6Zor2qhXzr3vhnYSvDGQBcMxUd0mWSGuh2hWjWJ+QMpn0rmzEhq8pCsiTAOmUruZsZ+If7yZyoRS
UB4ANeU3YWYbH9onVnqH0neKMUryDKcFkx3IUi0RWuchhXQWDtI6C6isNQtTKZxruj1v6pQO83rL
PdCoq6ibbeVGRFWjmW3g8DYdnbTYNorB1fY4JDG3tFgugqCBmZX5qUp1qJcmYXg7ZFRlkskOpqSJ
wn+LuSKcKEg4RgPjgA==


--Boundary_(ID_3cKQucLGv5lJos19Rp9DuA)--