bk commit into 5.1 tree (svoj:1.2572) BUG#34789

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj.  When svoj does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-25 17:37:53+04:00, svoj@stripped +3 -0
  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.

  mysql-test/r/federated.result@stripped, 2008-03-25 17:37:51+04:00, svoj@stripped +2 -0
    CREATE SERVER is only tested by federated_server.test, which requires
    big-test option. Added dummy test case to make gcov happy.

  mysql-test/t/federated.test@stripped, 2008-03-25 17:37:51+04:00, svoj@stripped +6 -0
    CREATE SERVER is only tested by federated_server.test, which requires
    big-test option. Added dummy test case to make gcov happy.

  sql/sql_parse.cc@stripped, 2008-03-25 17:37:51+04:00, svoj@stripped +1 -1
    Make gcov happy.

diff -Nrup a/mysql-test/r/federated.result b/mysql-test/r/federated.result
--- a/mysql-test/r/federated.result	2008-03-21 12:43:12 +04:00
+++ b/mysql-test/r/federated.result	2008-03-25 17:37:51 +04:00
@@ -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;
diff -Nrup a/mysql-test/t/federated.test b/mysql-test/t/federated.test
--- a/mysql-test/t/federated.test	2008-03-21 12:43:12 +04:00
+++ b/mysql-test/t/federated.test	2008-03-25 17:37:51 +04:00
@@ -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;
diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2008-03-20 11:57:28 +04:00
+++ b/sql/sql_parse.cc	2008-03-25 17:37:51 +04:00
@@ -6487,7 +6487,7 @@ bool reload_acl_and_cache(THD *thd, ulon
       if (grant_reload(thd))
         result= 1;
       if (servers_reload(thd))
-        result= 1;
+        result= 1; /* purecov: inspected */
     }
     if (tmp_thd)
     {