[Commits] Rev 3860: Merge of patch for MDEV#5786. in lp:~maria-captains/maria/maria-10.0-galera

Nirbhay Choubey nirbhay at skysql.com
Fri Jul 11 20:40:47 EEST 2014


At lp:~maria-captains/maria/maria-10.0-galera

------------------------------------------------------------
revno: 3860
revision-id: nirbhay at skysql.com-20140711174039-8n9ic8wbvtvbqttg
parent: nirbhay at skysql.com-20140709150723-rdphpx4b4y58wqdw
committer: Nirbhay Choubey <nirbhay at skysql.com>
branch nick: maria-10.0-galera
timestamp: Fri 2014-07-11 13:40:39 -0400
message:
  Merge of patch for MDEV#5786.
-------------- next part --------------
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2014-05-09 10:35:11 +0000
+++ b/client/mysql_upgrade.c	2014-07-11 17:40:39 +0000
@@ -523,7 +523,12 @@
   int ret;
   File fd;
   char query_file_path[FN_REFLEN];
+#ifdef WITH_WSREP
+  /* Note: wsrep_on=ON implicitly enables binary logging. */
+  const uchar sql_log_bin[]= "SET SQL_LOG_BIN=0, WSREP_ON=OFF;";
+#else
   const uchar sql_log_bin[]= "SET SQL_LOG_BIN=0;";
+#endif /* WITH_WSREP */
 
   DBUG_ENTER("run_query");
   DBUG_PRINT("enter", ("query: %s", query));

=== modified file 'client/mysqlcheck.c'
--- a/client/mysqlcheck.c	2014-02-26 14:28:07 +0000
+++ b/client/mysqlcheck.c	2014-07-11 17:40:39 +0000
@@ -731,9 +731,15 @@
   DBUG_RETURN(0);
 } /* use_db */
 
+/* Do not send commands to replication slaves. */
 static int disable_binlog()
 {
+#ifdef WITH_WSREP
+  /* Additionally turn off @@wsrep_on to disable implicit binary logging. */
+  const char *stmt= "SET SQL_LOG_BIN=0, WSREP_ON=OFF";
+#else
   const char *stmt= "SET SQL_LOG_BIN=0";
+#endif /* WITH_WSREP */
   return run_query(stmt);
 }
 



More information about the commits mailing list