diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
| commit | 081fd8bfa280635a7e699a17b035032460cb5160 (patch) | |
| tree | d5ea2c0f31aafe566d749f6dd60f5bc631f60862 /sql/wsrep_utils.h | |
| parent | 09cea8703f3ec4e4f9e23855a339c9e3d5e84d3b (diff) | |
| parent | a193c5720ea461ce82390af3fe9c292581242223 (diff) | |
| download | mariadb-git-081fd8bfa280635a7e699a17b035032460cb5160.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/wsrep_utils.h')
| -rw-r--r-- | sql/wsrep_utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_utils.h b/sql/wsrep_utils.h index 277cea9dc31..0afca96ea41 100644 --- a/sql/wsrep_utils.h +++ b/sql/wsrep_utils.h @@ -108,7 +108,8 @@ private: /* Hostname with port (host:port) */ start= addr_in; end= colon; - parse_port(colon + 1); + if (parse_port(colon + 1)) + return; /* Error: invalid port */ break; default: /* IPv6 address */ |