diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
commit | 32ec5fb979760ba2db52d8afc39e8e090cf80a9c (patch) | |
tree | 354038721b2f99c9834c31c4a6f3a5fa23c21341 /sql/wsrep_sst.cc | |
parent | e8de75db88acdf228237fbebad7f4c8f05e5cc1f (diff) | |
parent | 9de2e60d7491fcf3cd1f20a4be715ef0bedc316f (diff) | |
download | mariadb-git-32ec5fb979760ba2db52d8afc39e8e090cf80a9c.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r-- | sql/wsrep_sst.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index bda79ed7406..8079ebaf563 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -756,7 +756,7 @@ static ssize_t sst_prepare_other (const char* method, my_free(binlog_opt_val); my_free(binlog_index_opt_val); - if (ret < 0 || ret >= cmd_len) + if (ret < 0 || size_t(ret) >= cmd_len) { WSREP_ERROR("sst_prepare_other(): snprintf() failed: %d", ret); return (ret < 0 ? ret : -EMSGSIZE); @@ -1067,7 +1067,7 @@ static int sst_donate_mysqldump (const char* addr, (long long)seqno, wsrep_gtid_domain_id, bypass ? " " WSREP_SST_OPT_BYPASS : ""); - if (ret < 0 || ret >= cmd_len) + if (ret < 0 || size_t(ret) >= cmd_len) { WSREP_ERROR("sst_donate_mysqldump(): snprintf() failed: %d", ret); return (ret < 0 ? ret : -EMSGSIZE); @@ -1437,7 +1437,7 @@ static int sst_donate_other (const char* method, bypass ? " " WSREP_SST_OPT_BYPASS : ""); my_free(binlog_opt_val); - if (ret < 0 || ret >= cmd_len) + if (ret < 0 || size_t(ret) >= cmd_len) { WSREP_ERROR("sst_donate_other(): snprintf() failed: %d", ret); return (ret < 0 ? ret : -EMSGSIZE); |