database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

This commit fixes

Browse Source 
- errno handling in wsp::env::append() method, where error could be returned by mistake
  - return code of sst_prepare_other() when pthread_create() fails - it was returning positive error code which by convention is treated as success.
This commit is contained in:
Alexey Yurchenko
2015-06-08 21:06:22 +03:00
committed by Nirbhay Choubey
parent 1b1410c449
commit d809fcc301
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/wsrep_sst.cc
View File

@ -1,4 +1,4 @@
/* Copyright 2008-2012 Codership Oy <http://www.codership.com> /* Copyright 2008-2015 Codership Oy <http://www.codership.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -485,7 +485,7 @@ static ssize_t sst_prepare_other (const char* method,
{ {
WSREP_ERROR("sst_prepare_other(): pthread_create() failed: %d (%s)", WSREP_ERROR("sst_prepare_other(): pthread_create() failed: %d (%s)",
ret, strerror(ret)); ret, strerror(ret));
return ret; return -ret;
} }
mysql_cond_wait (&arg.cond, &arg.lock); mysql_cond_wait (&arg.cond, &arg.lock);

7
sql/wsrep_utils.cc
View File

@ -1,4 +1,4 @@
/* Copyright 2010 Codership Oy <http://www.codership.com> /* Copyright 2010-2015 Codership Oy <http://www.codership.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -165,10 +165,9 @@ env::append(const char* val)
++len_; ++len_;
env_[len_] = NULL; env_[len_] = NULL;
} }
else errno_ = errno;
} }
else errno_ = errno;
/* if either realloc() or strdup() failed, errno had been set */
errno_ = errno;
return errno_; return errno_;
} }

2
sql/wsrep_utils.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Codership Oy <info@codership.com> /* Copyright (C) 2013-2015 Codership Oy <info@codership.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by