Commit 9f3784d2 authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Post-merge fix

parent c882b871

storage/federated/ha_federated.cc

+2 −1
Original line number Diff line number Diff line
@@ -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;

  }