summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmysql/libmysql.c2
-rw-r--r--sql/sql_class.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index cca60b1ca87..e80684a1b1e 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));
}
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index e6106675159..2246f65d0e5 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -226,7 +226,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