From 9f3784d23b39231d56ff628e1fa1addf8783e6df Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Wed, 26 Mar 2008 16:22:10 +0100
Subject: [PATCH] Post-merge fix

---
 storage/federated/ha_federated.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
   }