Post-merge fix
This commit is contained in:
parent
c882b87110
commit
9f3784d23b
@ -842,11 +842,12 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
|
|||||||
*/
|
*/
|
||||||
if (share->hostname[0] == '\0')
|
if (share->hostname[0] == '\0')
|
||||||
share->hostname= NULL;
|
share->hostname= NULL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!share->port)
|
if (!share->port)
|
||||||
{
|
{
|
||||||
if (!share->hostname || strcmp(share->hostname, my_localhost) == 0)
|
if (!share->hostname || strcmp(share->hostname, my_localhost) == 0)
|
||||||
|
share->socket= (char*) MYSQL_UNIX_ADDR;
|
||||||
else
|
else
|
||||||
share->port= MYSQL_PORT;
|
share->port= MYSQL_PORT;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user