diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2019-11-25 17:24:09 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2019-11-25 17:24:09 +0300 |
| commit | 0c05a2ed71ebf408e32f7fcdd358d756948d8a5d (patch) | |
| tree | fabe919df6b001b22391f37c7a32a1e34a6bfd79 /storage/federatedx | |
| parent | 7c7f9bef28aa566557da31402142f6dd8298ddd2 (diff) | |
| parent | f9ceb0a67ffb20631c936a7e8e8776c000d677ac (diff) | |
| download | mariadb-git-0c05a2ed71ebf408e32f7fcdd358d756948d8a5d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 7db6fe9d541..261074fa98d 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -806,12 +806,12 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share, goto error; if (share->hostname[0] == '\0') - share->hostname= NULL; + share->hostname= strdup_root(mem_root, my_localhost); } if (!share->port) { - if (!share->hostname || strcmp(share->hostname, my_localhost) == 0) + if (0 == strcmp(share->hostname, my_localhost)) share->socket= (char *) MYSQL_UNIX_ADDR; else share->port= MYSQL_PORT; @@ -3396,8 +3396,7 @@ int ha_federatedx::create(const char *name, TABLE *table_arg, goto error; /* loopback socket connections hang due to LOCK_open mutex */ - if ((!tmp_share.hostname || !strcmp(tmp_share.hostname,my_localhost)) && - !tmp_share.port) + if (0 == strcmp(tmp_share.hostname, my_localhost) && !tmp_share.port) goto error; /* |