database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-06-30 16:38:05 +02:00
parent 0bb30f3603 33492ec8d4
commit 932646b1ff
993 changed files with 59089 additions and 14889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/wsrep_utils.h
View File

@ -19,7 +19,7 @@
#include "wsrep_priv.h"
#include "wsrep_mysqld.h"
unsigned int wsrep_check_ip (const char* addr, bool *is_ipv6);
unsigned int wsrep_check_ip (const char* const addr, bool *is_ipv6);
size_t wsrep_guess_ip (char* buf, size_t buf_len);
namespace wsp {
@ -155,6 +155,7 @@ private:
}
bool parse_port(const char *port) {
errno= 0; /* Reset the errno */
m_port= strtol(port, NULL, 10);
if (errno == EINVAL || errno == ERANGE)
{