summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2008-12-29 16:15:48 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2008-12-29 16:15:48 +0400
commit39442f0903378d3a4866d09b4846f52a860abc29 (patch)
tree4abe304bbc2dd38477bd016437783452c8d4f8b8 /sql/mysqld.cc
parentbcfa0cedb26c372ed978d54d8f3d785d616132fa (diff)
parent3b617acb87bce94b6ac27e3d91017cfaa9d67b83 (diff)
downloadmariadb-git-39442f0903378d3a4866d09b4846f52a860abc29.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b2505a99a0d..b7f9457da3d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6910,6 +6910,14 @@ The minimum value for this variable is 4096.",
};
+static int show_queries(THD *thd, SHOW_VAR *var, char *buff)
+{
+ var->type= SHOW_LONGLONG;
+ var->value= (char *)&thd->query_id;
+ return 0;
+}
+
+
static int show_net_compression(THD *thd, SHOW_VAR *var, char *buff)
{
var->type= SHOW_MY_BOOL;
@@ -7325,6 +7333,7 @@ SHOW_VAR status_vars[]= {
{"Qcache_queries_in_cache", (char*) &query_cache.queries_in_cache, SHOW_LONG_NOFLUSH},
{"Qcache_total_blocks", (char*) &query_cache.total_blocks, SHOW_LONG_NOFLUSH},
#endif /*HAVE_QUERY_CACHE*/
+ {"Queries", (char*) &show_queries, SHOW_FUNC},
{"Questions", (char*) offsetof(STATUS_VAR, questions), SHOW_LONG_STATUS},
#ifdef HAVE_REPLICATION
{"Rpl_status", (char*) &show_rpl_status, SHOW_FUNC},