Merge mysql.com:/home/svoj/devel/mysql/push/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines

1 files changed, 8 insertions, 1 deletions

diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index d7040c44fe8..30702ac4344 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -833,13 +833,20 @@ Then password is a null string, so set to NULL
     if ((strchr(share->table_name, '/')))
       goto error;
 
+    /*
+      If hostname is omitted, we set it to NULL. According to
+      mysql_real_connect() manual:
+      The value of host may be either a hostname or an IP address.
+      If host is NULL or the string "localhost", a connection to the
+      local host is assumed.
+    */
     if (share->hostname[0] == '\0')
       share->hostname= NULL;
 
   }
   if (!share->port)
   {
-    if (strcmp(share->hostname, my_localhost) == 0)
+    if (!share->hostname || strcmp(share->hostname, my_localhost) == 0)
       share->socket= (char *) MYSQL_UNIX_ADDR;
     else
       share->port= MYSQL_PORT;