summaryrefslogtreecommitdiff
path: root/sql/wsrep_var.cc
diff options
context:
space:
mode:
authorAlexey Yurchenko <ayurchen@gmail.com>2015-03-26 23:19:52 +0200
committerNirbhay Choubey <nirbhay@mariadb.com>2015-05-08 17:41:07 -0400
commitc16ec074196aee32326a8015f49c0b8bae25111f (patch)
tree10a33151c9556595f0ea217583d38fda9412c2dc /sql/wsrep_var.cc
parent0115ca2ae1c0ce06b3de6cc8c4f7f8a06220cff6 (diff)
downloadmariadb-git-c16ec074196aee32326a8015f49c0b8bae25111f.tar.gz
Refs codership/mysql-features#33 - this fixes a bug where wsrep_start_position_update() would pass local_uuid and local_seqno to wsrep_sst_received() instead of real, submitted position.
Diffstat (limited to 'sql/wsrep_var.cc')
-rw-r--r--sql/wsrep_var.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index 00b9ce3e4e8..0f0a04ba435 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -144,10 +144,10 @@ err:
static
void wsrep_set_local_position(const char* const value, bool const sst)
{
- size_t const value_len = strlen(value);
+ size_t const value_len(strlen(value));
wsrep_uuid_t uuid;
- size_t const uuid_len = wsrep_uuid_scan(value, value_len, &uuid);
- wsrep_seqno_t const seqno = strtoll(value + uuid_len + 1, NULL, 10);
+ size_t const uuid_len(wsrep_uuid_scan(value, value_len, &uuid));
+ wsrep_seqno_t const seqno(strtoll(value + uuid_len + 1, NULL, 10));
if (sst) {
wsrep_sst_received (wsrep, uuid, seqno, NULL, 0);