From 22ebbfef9125adf37f463c12d1fdb5e2dcdb5734 Mon Sep 17 00:00:00 2001
From: "tsmith@siva.hindu.god" <>
Date: Tue, 6 Mar 2007 14:47:26 -0700
Subject: [PATCH 1/2] Fix for bug #25595 "missing DBUG_RETURN in function
 "mysql_stat""

---
 libmysql/libmysql.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 7e1ff92bce5..6d1ad868e93 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1367,7 +1367,7 @@ mysql_stat(MYSQL *mysql)
 {
   DBUG_ENTER("mysql_stat");
   if (simple_command(mysql,COM_STATISTICS,0,0,0))
-    return mysql->net.last_error;
+    DBUG_RETURN(mysql->net.last_error);
   DBUG_RETURN((*mysql->methods->read_statistics)(mysql));
 }
 

From 041bea85bf26661957aaf3693a3aa52734f0b60a Mon Sep 17 00:00:00 2001
From: "tsmith@siva.hindu.god" <>
Date: Tue, 6 Mar 2007 14:55:52 -0700
Subject: [PATCH 2/2] Bug #25075: sql_class.cc doesn't compile with
 --without-query-cache

Wrap query_cache_init_query() call with #ifdef HAVE_QUERY_CACHE in THD::THD()
---
 sql/sql_class.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 714b1244be4..bd9caf6a487 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -224,7 +224,9 @@ THD::THD()
 #endif
   client_capabilities= 0;                       // minimalistic client
   net.last_error[0]=0;                          // If error on boot
+#ifdef HAVE_QUERY_CACHE
   query_cache_init_query(&net);                 // If error on boot
+#endif
   ull=0;
   system_thread= cleanup_done= abort_on_warning= no_warnings_for_error= 0;
   peer_port= 0;					// For SHOW PROCESSLIST