mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-25 01:35:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-6594: Use separate domain_id for Galera transactions

Browse source 
Post-fix : A typo and better error handling.
This commit is contained in:
Nirbhay Choubey 2015-04-15 11:12:12 -04:00
commit d051f6c36b
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/wsrep_sst.cc
View file

@ -451,7 +451,7 @@ static void* sst_joiner_thread (void* a)
} else {
// Scan state ID first followed by wsrep_gtid_domain_id.
char uuid[512];
uint32 domain_id;
long int domain_id;
size_t len= pos - out + 1;
if (len > sizeof(uuid)) goto err; // safety check
@ -464,14 +464,18 @@ static void* sst_joiner_thread (void* a)
}
else if (wsrep_gtid_mode)
{
errno= 0; /* Reset the errno */
domain_id= strtol(pos + 1, NULL, 10);
if (domain_id < 1000 || domain_id > 0xFFFF)
err= errno;
/* Check if we received a valid gtid_domain_id. */
if (err == EINVAL || err == ERANGE || domain_id < 0x0 || domain_id > 0xFFFF)
{
WSREP_ERROR("Failed to get donor wsrep_gtid_domain_id.");
err= EINVAL;
goto err;
} else {
wsrep_gtid_domain_id= domain_id;
wsrep_gtid_domain_id= (uint32) domain_id;
}
}
}