database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"

Browse Source 
10.1 part of the fix
This commit is contained in:
Sergei Golubchik
2016-03-18 16:54:05 +01:00
parent 3b0c7ac1f9
commit e984159e39
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/wsrep_sst.cc
View File

@@ -875,7 +875,7 @@ static int sst_donate_mysqldump (const char* addr,
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, wsrep_gtid_domain_id, (long long)seqno, wsrep_gtid_domain_id,
bypass ? " "WSREP_SST_OPT_BYPASS : ""); bypass ? " " WSREP_SST_OPT_BYPASS : "");
if (ret < 0 || ret >= cmd_len) if (ret < 0 || ret >= cmd_len)
{ {
@@ -1220,7 +1220,7 @@ static int sst_donate_other (const char* method,
wsrep_defaults_file, wsrep_defaults_file,
binlog_opt, binlog_opt_val, binlog_opt, binlog_opt_val,
uuid, (long long) seqno, wsrep_gtid_domain_id, uuid, (long long) seqno, wsrep_gtid_domain_id,
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)