database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge of patch for MDEV#5786.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-07-11 13:40:39 -04:00
parent dc377fcbc0
commit b6a116cede
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql_upgrade.c
View File

@@ -523,7 +523,12 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
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));

6
client/mysqlcheck.c
View File

@@ -731,9 +731,15 @@ static int use_db(char *database)
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);
}