diff options
| author | unknown <istruewing@stella.local> | 2008-03-26 16:22:10 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-26 16:22:10 +0100 |
| commit | 10d9d68d7cbe1bbf9cf37fee71473b097a89f239 (patch) | |
| tree | 773a8d485a77d72ed3a22614f8113d2a3c51e6e8 /storage/federated | |
| parent | cebc10e3c08a832ab9fffc26e4ef8633630dd082 (diff) | |
| download | mariadb-git-10d9d68d7cbe1bbf9cf37fee71473b097a89f239.tar.gz | |
Post-merge fix
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index ed9a7a9cf8f..5702b2f3514 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -842,11 +842,12 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table, */ if (share->hostname[0] == '\0') share->hostname= NULL; - } + if (!share->port) { if (!share->hostname || strcmp(share->hostname, my_localhost) == 0) + share->socket= (char*) MYSQL_UNIX_ADDR; else share->port= MYSQL_PORT; } |