[Commits] Rev 3359: MDEV-507 deb/rpm packages for galera builds. in file:///home/hf/wmar/mdev507/

holyfoot at askmonty.org holyfoot at askmonty.org
Tue Nov 27 14:31:39 EET 2012


At file:///home/hf/wmar/mdev507/

------------------------------------------------------------
revno: 3359
revision-id: holyfoot at askmonty.org-20121127122210-m271lyiqn91t30cx
parent: holyfoot at askmonty.org-20121119090138-5r380g9tqtl2qzee
committer: Alexey Botchkov <holyfoot at askmonty.org>
branch nick: mdev507
timestamp: Tue 2012-11-27 16:22:10 +0400
message:
  MDEV-507 deb/rpm packages for galera builds.
          If settings are not suitable for the WSREP, just
          turn it off and keep working.
-------------- next part --------------
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-10-24 20:13:43 +0000
+++ b/sql/mysqld.cc	2012-11-27 12:22:10 +0000
@@ -3701,7 +3701,7 @@ static int init_common_variables()
 #ifdef WITH_WSREP
   /* This is a protection against mutually incompatible option values. */
   if (WSREP_ON && wsrep_check_opts (remaining_argc, remaining_argv))
-    return 1;
+    global_system_variables.wsrep_on= 0;
 #endif /* WITH_WSREP */
   if (get_options(&remaining_argc, &remaining_argv))
     return 1;



More information about the commits mailing list