From 811fb145eaf694485395934c81c7576a000e2cc7 Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Tue, 25 Mar 2008 17:37:53 +0400
Subject: [PATCH] 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:
  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:
  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:
  Make gcov happy.
---
 mysql-test/r/federated.result | 2 ++
 mysql-test/t/federated.test   | 6 ++++++
 sql/sql_parse.cc              | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index 65fafcb2166..21743c3a8a6 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -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 --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index 0fd2290d619..6540cf8648e 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -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 --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 046eae4e654..a2708632a56 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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)
     {