From: Date: May 24 2006 3:34pm
Subject: bk commit into 5.0 tree (iggy:1.2127) BUG#18669
List-Archive: http://lists.mysql.com/commits/6833
X-Bug: 18669
Message-Id: <20060524133443.B49E01775B6@ignatz42.dyndns.org>

Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy 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
  1.2127 06/05/24 09:34:36 iggy@stripped +1 -0
  BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
  
  Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

  sql/sql_parse.cc
    1.544 06/05/24 09:34:32 iggy@stripped +6 -2
    Calculate and display the global statistics.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-5.0-maint_bug18669

--- 1.543/sql/sql_parse.cc	2006-05-06 03:25:53 -04:00
+++ 1.544/sql/sql_parse.cc	2006-05-24 09:34:32 -04:00
@@ -1992,13 +1992,17 @@
 #else
     char *buff= thd->net.last_error;
 #endif
+
+    STATUS_VAR current_global_status_var;
+    calc_sum_of_all_status(&current_global_status_var);
+
     ulong uptime = (ulong) (thd->start_time - start_time);
     sprintf((char*) buff,
 	    "Uptime: %lu  Threads: %d  Questions: %lu  Slow queries: %lu  Opens: %lu  Flush tables: %lu  Open tables: %u  Queries per second avg: %.3f",
 	    uptime,
 	    (int) thread_count, (ulong) thd->query_id,
-            (ulong) thd->status_var.long_query_count,
-	    thd->status_var.opened_tables, refresh_version, cached_tables(),
+	    current_global_status_var.long_query_count,
+	    current_global_status_var.opened_tables, refresh_version, cached_tables(),
 	    (uptime ? (ulonglong2double(thd->query_id) / (double) uptime) :
 	     (double) 0));
 #ifdef SAFEMALLOC