Commit 88247fd2 authored by svoj@mysql.com/june.mysql.com's avatar svoj@mysql.com/june.mysql.com
Browse files

BUG#34789 - drop server/create server leaks memory ! 

BUG#34790 - 'create server' doesn't handle out of memory scenario
            well enough

This is an addition to fixes for these bugs, which makes gcov
happy.
parent b799ea24

mysql-test/r/federated.result

+2 −0
Original line number Diff line number Diff line
@@ -2092,6 +2092,8 @@ DROP TABLE t1; 
DROP TABLE t1;

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

DROP TABLE t1;

create server 's1' foreign data wrapper 'mysql' options (port 3306);

drop server 's1';

End of 5.1 tests

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

mysql-test/t/federated.test

+6 −0
Original line number Diff line number Diff line
@@ -1823,5 +1823,11 @@ DROP TABLE t1; 
CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';

DROP TABLE t1;



#

# Coverage testing of CREATE SERVER.

#

create server 's1' foreign data wrapper 'mysql' options (port 3306);

drop server 's1';



--echo End of 5.1 tests

source include/federated_cleanup.inc;

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -6487,7 +6487,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, 
      if (grant_reload(thd))

        result= 1;

      if (servers_reload(thd))

        result= 1;

        result= 1; /* purecov: inspected */

    }

    if (tmp_thd)

    {