Commit 0eff6e7b authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Merge stella.local:/home2/mydev/mysql-5.0-axmrg 

into  stella.local:/home2/mydev/mysql-5.1-axmrg
parents 44fbe74e c82b842a

mysql-test/r/federated.result

+2 −0
Original line number Diff line number Diff line
@@ -2090,6 +2090,8 @@ a b 
1	1

DROP TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';

DROP TABLE t1;

End of 5.1 tests

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

mysql-test/t/federated.test

+12 −0
Original line number Diff line number Diff line
@@ -1816,5 +1816,17 @@ DROP TABLE t1; 
connection slave;

DROP TABLE t1;



#

# BUG#34788 - malformed federated connection url is not handled correctly -

#             crashes server !

#

# also tests

#

# BUG#35509 - Federated leaks memory when connecting to localhost/default

#             port

#

CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';

DROP TABLE t1;



--echo End of 5.1 tests

source include/federated_cleanup.inc;

storage/federated/ha_federated.cc

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