From 04f93ca02ab3715d6b16d36dcfda7b6d8c8d791c Mon Sep 17 00:00:00 2001
From: unknown <konstantin@mysql.com>
Date: Sun, 23 Apr 2006 04:09:56 +0400
Subject: [PATCH] A post-merge fix.

---
 sql/mysqld.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ed10286f91e..923eb530099 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -8071,8 +8071,9 @@ void refresh_status(THD *thd)
   add_to_status(&global_status_var, &thd->status_var);
   bzero((char*) &thd->status_var, sizeof(thd->status_var));
 
-  for (struct show_var_st *ptr=status_vars; ptr->name; ptr++)
+  for (SHOW_VAR *ptr= status_vars; ptr->name; ptr++)
   {
+    /* Note that SHOW_LONG_NOFLUSH variables are not reset */
     if (ptr->type == SHOW_LONG)
       *(ulong*) ptr->value= 0;
   }