diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-23 08:06:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-23 08:06:17 +0300 |
| commit | efb8485d85b19a2a729310adc6779ca649198f29 (patch) | |
| tree | a2b7778acfecd95d2f5b1fcff588d93268afa112 /sql/wsrep_sst.cc | |
| parent | 235cf969d21ba3406a9325d952fda47c589e58d6 (diff) | |
| parent | b96e4424fb4d35dd5de52f44ed6b726a3f0dd010 (diff) | |
| download | mariadb-git-efb8485d85b19a2a729310adc6779ca649198f29.tar.gz | |
Merge 10.3 into 10.4, except for MDEV-20265
The MDEV-20265 commit e746f451d57def4be679caafc29976741b3e89f7
introduces DBUG_ASSERT(right_op == r_tbl) in
st_select_lex::add_cross_joined_table(), and that assertion would
fail in several tests that exercise joins. That commit was skipped
in this merge, and a separate fix of MDEV-20265 will be necessary in 10.4.
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 5602b13f4fd..e2878211d7e 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -640,7 +640,7 @@ static ssize_t sst_prepare_other (const char* method, const char** addr_out) { bool extra_args; - ssize_t const cmd_len= estimate_cmd_len(&extra_args); + size_t const cmd_len= estimate_cmd_len(&extra_args); wsp::string cmd_str(cmd_len); if (!cmd_str()) @@ -690,7 +690,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); @@ -953,7 +953,7 @@ static int sst_donate_mysqldump (const char* addr, memcpy(host, address.get_address(), address.get_address_len()); int port= address.get_port(); bool extra_args; - ssize_t const cmd_len= estimate_cmd_len(&extra_args); + size_t const cmd_len= estimate_cmd_len(&extra_args); wsp::string cmd_str(cmd_len); if (!cmd_str()) @@ -990,7 +990,7 @@ static int sst_donate_mysqldump (const char* addr, 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); @@ -1350,7 +1350,7 @@ static int sst_donate_other (const char* method, char** env) // carries auth info { bool extra_args; - ssize_t const cmd_len= estimate_cmd_len(&extra_args); + size_t const cmd_len= estimate_cmd_len(&extra_args); wsp::string cmd_str(cmd_len); if (!cmd_str()) @@ -1406,7 +1406,7 @@ static int sst_donate_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_donate_other(): snprintf() failed: %d", ret); return (ret < 0 ? ret : -EMSGSIZE); |