Post-merge fix

10d9d68d · unknown · cebc10e3 · 10d9d68d
Commit 10d9d68d authored Mar 26, 2008 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/federated/ha_federated.cc storage/federated/ha_federated.cc +2 -1

No files found.
--- 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;
  }