1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings on gcc 6.x.

Browse Source
This commit is contained in:
Jan Lindström 2017-04-05 14:35:41 +03:00
parent 4b1cf0bba6
commit 09b28b3d10
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -2177,7 +2177,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use,
#ifdef WITH_WSREP #ifdef WITH_WSREP
{ {
signalled|= mysql_lock_abort_for_thread(this, thd_table); signalled|= mysql_lock_abort_for_thread(this, thd_table);
if (this && WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE)) if (WSREP(this) && wsrep_thd_is_BF((void *)this, FALSE))
{ {
WSREP_DEBUG("remove_table_from_cache: %llu", WSREP_DEBUG("remove_table_from_cache: %llu",
(unsigned long long) this->real_id); (unsigned long long) this->real_id);

2
sql/wsrep_mysqld.h
View File

@ -207,7 +207,7 @@ extern wsrep_seqno_t wsrep_locked_seqno;
strcmp(wsrep_provider, WSREP_NONE)) strcmp(wsrep_provider, WSREP_NONE))
#define WSREP(thd) \ #define WSREP(thd) \
(WSREP_ON && wsrep && (thd && thd->variables.wsrep_on)) (WSREP_ON && wsrep && (thd->variables.wsrep_on))
#define WSREP_CLIENT(thd) \ #define WSREP_CLIENT(thd) \
(WSREP(thd) && thd->wsrep_client_thread) (WSREP(thd) && thd->wsrep_client_thread)

4
sql/wsrep_sst.cc
View File

@ -814,7 +814,7 @@ static int sst_donate_mysqldump (const char* addr,
"%s", "%s",
host, port, mysqld_port, mysqld_unix_port, host, port, mysqld_port, mysqld_unix_port,
wsrep_defaults_file, uuid_str, wsrep_defaults_file, uuid_str,
(long long)seqno, bypass ? " "WSREP_SST_OPT_BYPASS : ""); (long long)seqno, bypass ? " " WSREP_SST_OPT_BYPASS : "");
if (ret < 0 || ret >= cmd_len) if (ret < 0 || ret >= cmd_len)
{ {
@ -1125,7 +1125,7 @@ static int sst_donate_other (const char* method,
wsrep_defaults_file, wsrep_defaults_group_suffix, wsrep_defaults_file, wsrep_defaults_group_suffix,
binlog_opt, binlog_opt_val, binlog_opt, binlog_opt_val,
uuid, (long long) seqno, uuid, (long long) seqno,
bypass ? " "WSREP_SST_OPT_BYPASS : ""); bypass ? " " WSREP_SST_OPT_BYPASS : "");
my_free(binlog_opt_val); my_free(binlog_opt_val);
if (ret < 0 || ret >= cmd_len) if (ret < 0 || ret >= cmd_len)