Merge lp:~linuxjedi/drizzle/drizzle-bug-621603 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Fixes for:

Bug#621603: Connections status variable very wrong
Bug#621947: show processlist filldown

[Brian Aker (brianaker)]

How can we make "connections" be protocol specific?

[Andrew Hutchings (linuxjedi)]

Interesting question. Well, I guess the obvious thing to do would be to have each protocol plugin have a sysvar. Unfortunately to me it looks like plugin specific sysvars are broken. So...

[Andrew Hutchings (linuxjedi)]

(sorry, I meant status variables)

[Monty Taylor (mordred)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/23/2010 12:12 AM, Andrew Hutchings wrote:
> Interesting question. Well, I guess the obvious thing to do would be
> to have each protocol plugin have a sysvar. Unfortunately to me it
> looks like plugin specific sysvars are broken. So...

Aroo???
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxyIRcACgkQ2Jv7/VK1RgGC5QCg3w+39GE/EsuzddOxf9jPBq/2
yx8AnAh3suPZN8aFGDcBFgmFj9Rjt12f
=FnG8
-----END PGP SIGNATURE-----

[Monty Taylor (mordred)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/23/2010 12:12 AM, Andrew Hutchings wrote:
> (sorry, I meant status variables)

Aroo???
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxyISYACgkQ2Jv7/VK1RgGuNQCgrEMeaFcb1OWed/U9zCn1FTOQ
xL4An3kZPwtsIShwy6f91pjlc2mQj07m
=kj+G
-----END PGP SIGNATURE-----

[Andrew Hutchings (linuxjedi)]

Monty: see bug#622576

[Andrew Hutchings (linuxjedi)]

ok, so I like Brian's plan. I will put this merge request on hold and put the new bug as a blocker to the connections counter.

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

OK, so, in this branch to be reviewed:

1. Bug#621947: show processlist filldown
  * The processlist table now accepts null values so when null is provided it doesn't use the previous value.

2. Bug#628284: --mysql option broken
  * drizzle client can now use the drizzle protocol (when using --mysql=0)

3. Bug#621603: Connections status variable off by one
  * the global status counter is now fixed
  * the mysql protocol now has data_dictionary.mysql_protocol for its own counters
  * the drizzle protocol now has data_dictionary.drizzle_protocol for its own counters

[lp:~linuxjedi/drizzle/drizzle-bug-621603]

1733. By Andrew Hutchings on 2010-09-08

Merge trunk into branch

1734. By Andrew Hutchings on 2010-09-08

Fix tests

[Lee Bieber (kalebral-deactivatedaccount)]

Latest branch is failing to build on many platforms:

../plugin/drizzle_protocol/table_function.h:21: #ifndef header guard has wrong style, please use: PLUGIN_DRIZZLE_PROTOCOL_TABLE_FUNCTION_H [build/header_guard] [5]
../plugin/drizzle_protocol/table_function.h:57: #endif line should be "#endif /* PLUGIN_DRIZZLE_PROTOCOL_TABLE_FUNCTION_H */" [build/header_guard] [5]
python ../extra/cpplint.py --filter=-whitespace,-runtime,-readability,+legal,-build,+build/header_guard,+build/include_config,+build/namespaces --deps plugin/drizzle_protocol/vio.h.linted ../plugin/drizzle_protocol/vio.h
Done processing ../plugin/drizzle_protocol/pack.h

[lp:~linuxjedi/drizzle/drizzle-bug-621603]

1735. By LinuxJedi <linuxjedi@linuxjedi-laptop> on 2010-09-08

Fix table function header (I hate that my compiler didn't cry about this)

1736. By LinuxJedi <linuxjedi@linuxjedi-laptop> on 2010-09-09

Fix another wrong header, grr...

=== modified file 'drizzled/session.cc'
--- drizzled/session.cc	2010-08-24 16:45:09 +0000
+++ drizzled/session.cc	2010-09-09 06:18:43 +0000
@@ -538,6 +538,7 @@
     current_global_counters.max_used_connections= connection_count;
   }
 
+  current_global_counters.connections++;
   thread_id= variables.pseudo_thread_id= global_thread_id++;
 
   LOCK_thread_count.lock();
@@ -1730,6 +1731,7 @@
 
   flush_status_time= time((time_t*) 0);
   current_global_counters.max_used_connections= 1; /* We set it to one, because we know we exist */
+  current_global_counters.connections= 0;
 }
 
 user_var_entry *Session::getVariable(LEX_STRING &name, bool create_if_not_exists)

=== modified file 'drizzled/statistics_variables.h'
--- drizzled/statistics_variables.h	2010-08-09 18:29:06 +0000
+++ drizzled/statistics_variables.h	2010-09-09 06:18:43 +0000
@@ -33,6 +33,7 @@
 typedef struct global_counters
 {
   uint64_t max_used_connections;
+  uint64_t connections;
   uint64_t locks_immediate;
   uint64_t locks_waited;
 } global_counters;

=== modified file 'drizzled/status_helper.cc'
--- drizzled/status_helper.cc	2010-08-09 18:29:06 +0000
+++ drizzled/status_helper.cc	2010-09-09 06:18:43 +0000
@@ -134,7 +134,7 @@
   {"Aborted_connects",          (char*) offsetof(system_status_var, aborted_connects), SHOW_LONGLONG_STATUS},
   {"Bytes_received",            (char*) offsetof(system_status_var, bytes_received), SHOW_LONGLONG_STATUS},
   {"Bytes_sent",                (char*) offsetof(system_status_var, bytes_sent), SHOW_LONGLONG_STATUS},
-  {"Connections",               (char*) &global_thread_id, SHOW_INT_NOFLUSH},
+  {"Connections",               (char*) &current_global_counters.connections,  SHOW_LONGLONG},
   {"Created_tmp_disk_tables",   (char*) offsetof(system_status_var, created_tmp_disk_tables), SHOW_LONGLONG_STATUS},
   {"Created_tmp_tables",        (char*) offsetof(system_status_var, created_tmp_tables), SHOW_LONGLONG_STATUS},
   {"Flush_commands",            (char*) &refresh_version,    SHOW_INT_NOFLUSH},

=== modified file 'plugin/drizzle_protocol/drizzle_protocol.cc'
--- plugin/drizzle_protocol/drizzle_protocol.cc	2010-08-21 07:08:08 +0000
+++ plugin/drizzle_protocol/drizzle_protocol.cc	2010-09-09 06:18:43 +0000
@@ -33,6 +33,7 @@
 #include "errmsg.h"
 #include "drizzle_protocol.h"
 #include "options.h"
+#include "table_function.h"
 
 #define PROTOCOL_VERSION 10
 
@@ -54,6 +55,8 @@
 static uint32_t buffer_length;
 static char* bind_address= NULL;
 
+static plugin::TableFunction* drizzle_status_table_function_ptr= NULL;
+
 ListenDrizzleProtocol::~ListenDrizzleProtocol()
 {
   /* This is strdup'd from the options */
@@ -92,6 +95,10 @@
   return new (nothrow) ClientDrizzleProtocol(new_fd, using_mysql41_protocol);
 }
 
+drizzled::atomic<uint64_t> ClientDrizzleProtocol::connectionCount;
+drizzled::atomic<uint64_t> ClientDrizzleProtocol::failedConnections;
+drizzled::atomic<uint64_t> ClientDrizzleProtocol::connected;
+
 ClientDrizzleProtocol::ClientDrizzleProtocol(int fd, bool using_mysql41_protocol_arg):
   using_mysql41_protocol(using_mysql41_protocol_arg)
 {
@@ -150,6 +157,7 @@
   { 
     drizzleclient_net_close(&net);
     drizzleclient_net_end(&net);
+    connected.decrement();
   }
 }
 
@@ -157,6 +165,9 @@
 {
   bool connection_is_valid;
 
+  connectionCount.increment();
+  connected.increment();
+
   /* Use "connect_timeout" value during connection phase */
   drizzleclient_net_set_read_timeout(&net, connect_timeout);
   drizzleclient_net_set_write_timeout(&net, connect_timeout);
@@ -168,6 +179,7 @@
   else
   {
     sendError(session->main_da.sql_errno(), session->main_da.message());
+    failedConnections.increment();
     return false;
   }
 
@@ -818,6 +830,10 @@
 
 static int init(module::Context &context)
 {
+  drizzle_status_table_function_ptr= new DrizzleProtocolStatus;
+
+  context.add(drizzle_status_table_function_ptr);
+
   const module::option_map &vm= context.getOptions();
   if (vm.count("port"))
   { 
@@ -947,6 +963,103 @@
   NULL
 };
 
+static int drizzle_protocol_connection_count_func(drizzle_show_var *var, char *buff)
+{
+  var->type= SHOW_LONGLONG;
+  var->value= buff;
+  *((uint64_t *)buff)= ClientDrizzleProtocol::connectionCount;
+  return 0;
+}
+
+static int drizzle_protocol_connected_count_func(drizzle_show_var *var, char *buff)
+{
+  var->type= SHOW_LONGLONG;
+  var->value= buff;
+  *((uint64_t *)buff)= ClientDrizzleProtocol::connected;
+  return 0;
+}
+
+static int drizzle_protocol_failed_count_func(drizzle_show_var *var, char *buff)
+{
+  var->type= SHOW_LONGLONG;
+  var->value= buff;
+  *((uint64_t *)buff)= ClientDrizzleProtocol::failedConnections;
+  return 0;
+}
+
+static st_show_var_func_container drizzle_protocol_connection_count=
+  { &drizzle_protocol_connection_count_func };
+
+static st_show_var_func_container drizzle_protocol_connected_count=
+  { &drizzle_protocol_connected_count_func };
+
+static st_show_var_func_container drizzle_protocol_failed_count=
+  { &drizzle_protocol_failed_count_func };
+
+static drizzle_show_var drizzle_protocol_status_variables[]= {
+  {"Connections",
+  (char*) &drizzle_protocol_connection_count, SHOW_FUNC},
+  {"Connected",
+  (char*) &drizzle_protocol_connected_count, SHOW_FUNC},
+  {"Failed_connections",
+  (char*) &drizzle_protocol_failed_count, SHOW_FUNC},
+  {NULL, NULL, SHOW_LONGLONG}
+};
+
+DrizzleProtocolStatus::Generator::Generator(drizzled::Field **fields) :
+  plugin::TableFunction::Generator(fields)
+{
+  status_var_ptr= drizzle_protocol_status_variables;
+}
+
+bool DrizzleProtocolStatus::Generator::populate()
+{
+  MY_ALIGNED_BYTE_ARRAY(buff_data, SHOW_VAR_FUNC_BUFF_SIZE, int64_t);
+  char * const buff= (char *) &buff_data;
+  drizzle_show_var tmp;
+
+  if (status_var_ptr->name)
+  {
+    std::ostringstream oss;
+    string return_value;
+    const char *value;
+    int type;
+
+    push(status_var_ptr->name);
+
+    if (status_var_ptr->type == SHOW_FUNC)
+    {
+      ((mysql_show_var_func)((st_show_var_func_container *)status_var_ptr->value)->func)(&tmp, buff);
+      value= buff;
+      type= tmp.type;
+    }
+    else
+    {
+      value= status_var_ptr->value;
+      type= status_var_ptr->type;
+    }
+
+    switch(type)
+    {
+    case SHOW_LONGLONG:
+      oss << *(uint64_t*) value;
+      return_value= oss.str();
+      break;
+    default:
+      assert(0);
+    }
+    if (return_value.length())
+      push(return_value);
+    else
+      push(" ");
+
+    status_var_ptr++;
+
+    return true;
+  }
+  return false;
+}
+
 } /* namespace drizzle_protocol */
 
 DRIZZLE_PLUGIN(drizzle_protocol::init, drizzle_protocol::sys_variables, drizzle_protocol::init_options);

=== modified file 'plugin/drizzle_protocol/drizzle_protocol.h'
--- plugin/drizzle_protocol/drizzle_protocol.h	2010-08-12 06:10:25 +0000
+++ plugin/drizzle_protocol/drizzle_protocol.h	2010-09-09 06:18:43 +0000
@@ -22,6 +22,8 @@
 
 #include <drizzled/plugin/listen_tcp.h>
 #include <drizzled/plugin/client.h>
+#include <drizzled/atomics.h>
+#include "drizzled/plugin/table_function.h"
 
 #include "net_serv.h"
 
@@ -60,6 +62,10 @@
   ClientDrizzleProtocol(int fd, bool using_mysql41_protocol_arg);
   virtual ~ClientDrizzleProtocol();
 
+  static drizzled::atomic<uint64_t> connectionCount;
+  static drizzled::atomic<uint64_t> failedConnections;
+  static drizzled::atomic<uint64_t> connected;
+
   virtual int getFileDescriptor(void);
   virtual bool isConnected();
   virtual bool isReading(void);

=== modified file 'plugin/drizzle_protocol/plugin.ini'
--- plugin/drizzle_protocol/plugin.ini	2010-04-27 21:03:13 +0000
+++ plugin/drizzle_protocol/plugin.ini	2010-09-09 06:18:43 +0000
@@ -7,6 +7,6 @@
 libs=drizzled/algorithm/libhash.la
 load_by_default=yes
 ldlfags=$(LIBZ)
-headers=drizzle_protocol.h errmsg.h net_serv.h options.h pack.h vio.h
+headers=drizzle_protocol.h errmsg.h net_serv.h options.h pack.h vio.h table_function.h
 sources=drizzle_protocol.cc errmsg.cc net_serv.cc pack.cc vio.cc viosocket.cc
 static=yes

=== added file 'plugin/drizzle_protocol/table_function.h'
--- plugin/drizzle_protocol/table_function.h	1970-01-01 00:00:00 +0000
+++ plugin/drizzle_protocol/table_function.h	2010-09-09 06:18:43 +0000
@@ -0,0 +1,57 @@
+/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2010 Andrew Hutchings
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PLUGIN_DRIZZLE_PROTOCOL_TABLE_FUNCTION_H
+#define PLUGIN_DRIZZLE_PROTOCOL_TABLE_FUNCTION_H
+
+#include "drizzled/plugin/table_function.h"
+namespace drizzle_protocol
+{
+
+
+class DrizzleProtocolStatus : public drizzled::plugin::TableFunction
+{
+public:
+  DrizzleProtocolStatus() :
+    drizzled::plugin::TableFunction("DATA_DICTIONARY","DRIZZLE_PROTOCOL_STATUS")
+  {
+    add_field("VARIABLE_NAME");
+    add_field("VARIABLE_VALUE");
+  }
+
+  class Generator : public drizzled::plugin::TableFunction::Generator
+  {
+    drizzled::drizzle_show_var *status_var_ptr;
+
+  public:
+    Generator(drizzled::Field **fields);
+
+    bool populate();
+  };
+
+  Generator *generator(drizzled::Field **arg)
+  {
+    return new Generator(arg);
+  }
+};
+
+}
+
+#endif /* PLUGIN_DRIZZLE_PROTOCOL_TABLE_FUNCTION_H */

=== modified file 'plugin/information_schema_dictionary/tests/r/tables.result'
--- plugin/information_schema_dictionary/tests/r/tables.result	2010-08-19 00:32:20 +0000
+++ plugin/information_schema_dictionary/tests/r/tables.result	2010-09-09 06:18:43 +0000
@@ -12,6 +12,7 @@
 	DATA_DICTIONARY	CUMULATIVE_SQL_COMMANDS	VIEW
 	DATA_DICTIONARY	CUMULATIVE_USER_STATS	VIEW
 	DATA_DICTIONARY	CURRENT_SQL_COMMANDS	VIEW
+	DATA_DICTIONARY	DRIZZLE_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATEMENTS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_VARIABLES	VIEW
@@ -27,6 +28,7 @@
 	DATA_DICTIONARY	INNODB_STATUS	VIEW
 	DATA_DICTIONARY	INNODB_TRX	VIEW
 	DATA_DICTIONARY	MODULES	VIEW
+	DATA_DICTIONARY	MYSQL_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	PLUGINS	VIEW
 	DATA_DICTIONARY	PROCESSLIST	VIEW
 	DATA_DICTIONARY	REFERENTIAL_CONSTRAINTS	VIEW
@@ -81,6 +83,7 @@
 	DATA_DICTIONARY	CUMULATIVE_SQL_COMMANDS	VIEW
 	DATA_DICTIONARY	CUMULATIVE_USER_STATS	VIEW
 	DATA_DICTIONARY	CURRENT_SQL_COMMANDS	VIEW
+	DATA_DICTIONARY	DRIZZLE_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATEMENTS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_VARIABLES	VIEW
@@ -96,6 +99,7 @@
 	DATA_DICTIONARY	INNODB_STATUS	VIEW
 	DATA_DICTIONARY	INNODB_TRX	VIEW
 	DATA_DICTIONARY	MODULES	VIEW
+	DATA_DICTIONARY	MYSQL_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	PLUGINS	VIEW
 	DATA_DICTIONARY	PROCESSLIST	VIEW
 	DATA_DICTIONARY	REFERENTIAL_CONSTRAINTS	VIEW
@@ -173,6 +177,7 @@
 	DATA_DICTIONARY	CUMULATIVE_SQL_COMMANDS	VIEW
 	DATA_DICTIONARY	CUMULATIVE_USER_STATS	VIEW
 	DATA_DICTIONARY	CURRENT_SQL_COMMANDS	VIEW
+	DATA_DICTIONARY	DRIZZLE_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATEMENTS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_VARIABLES	VIEW
@@ -188,6 +193,7 @@
 	DATA_DICTIONARY	INNODB_STATUS	VIEW
 	DATA_DICTIONARY	INNODB_TRX	VIEW
 	DATA_DICTIONARY	MODULES	VIEW
+	DATA_DICTIONARY	MYSQL_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	PLUGINS	VIEW
 	DATA_DICTIONARY	PROCESSLIST	VIEW
 	DATA_DICTIONARY	REFERENTIAL_CONSTRAINTS	VIEW
@@ -265,6 +271,7 @@
 	DATA_DICTIONARY	CUMULATIVE_SQL_COMMANDS	VIEW
 	DATA_DICTIONARY	CUMULATIVE_USER_STATS	VIEW
 	DATA_DICTIONARY	CURRENT_SQL_COMMANDS	VIEW
+	DATA_DICTIONARY	DRIZZLE_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATEMENTS	VIEW
 	DATA_DICTIONARY	GLOBAL_STATUS	VIEW
 	DATA_DICTIONARY	GLOBAL_VARIABLES	VIEW
@@ -275,6 +282,7 @@
 	DATA_DICTIONARY	INNODB_LOCK_WAITS	VIEW
 	DATA_DICTIONARY	INNODB_STATUS	VIEW
 	DATA_DICTIONARY	MODULES	VIEW
+	DATA_DICTIONARY	MYSQL_PROTOCOL_STATUS	VIEW
 	DATA_DICTIONARY	PLUGINS	VIEW
 	DATA_DICTIONARY	REFERENTIAL_CONSTRAINTS	VIEW
 	DATA_DICTIONARY	REPLICATION_STREAMS	VIEW

=== modified file 'plugin/mysql_protocol/mysql_protocol.cc'
--- plugin/mysql_protocol/mysql_protocol.cc	2010-08-21 07:08:08 +0000
+++ plugin/mysql_protocol/mysql_protocol.cc	2010-09-09 06:18:43 +0000
@@ -31,6 +31,7 @@
 #include "mysql_protocol.h"
 #include "mysql_password.h"
 #include "options.h"
+#include "table_function.h"
 
 namespace po= boost::program_options;
 using namespace std;
@@ -51,6 +52,8 @@
 static const uint32_t random_max= 0x3FFFFFFF;
 static const double random_max_double= (double)0x3FFFFFFF;
 
+static plugin::TableFunction* mysql_status_table_function_ptr= NULL;
+
 ListenMySQLProtocol::~ListenMySQLProtocol()
 {
   /* This is strdup'd from the options */
@@ -77,6 +80,10 @@
   return new (nothrow) ClientMySQLProtocol(new_fd, using_mysql41_protocol);
 }
 
+drizzled::atomic<uint64_t> ClientMySQLProtocol::connectionCount;
+drizzled::atomic<uint64_t> ClientMySQLProtocol::failedConnections;
+drizzled::atomic<uint64_t> ClientMySQLProtocol::connected;
+
 ClientMySQLProtocol::ClientMySQLProtocol(int fd, bool using_mysql41_protocol_arg):
   using_mysql41_protocol(using_mysql41_protocol_arg)
 {
@@ -135,6 +142,7 @@
   { 
     drizzleclient_net_close(&net);
     drizzleclient_net_end(&net);
+    connected.decrement();
   }
 }
 
@@ -142,6 +150,9 @@
 {
   bool connection_is_valid;
 
+  connectionCount.increment();
+  connected.increment();
+
   /* Use "connect_timeout" value during connection phase */
   drizzleclient_net_set_read_timeout(&net, connect_timeout);
   drizzleclient_net_set_write_timeout(&net, connect_timeout);
@@ -153,9 +164,9 @@
   else
   {
     sendError(session->main_da.sql_errno(), session->main_da.message());
+    failedConnections.increment();
     return false;
   }
-
   /* Connect completed, set read/write timeouts back to default */
   drizzleclient_net_set_read_timeout(&net, read_timeout);
   drizzleclient_net_set_write_timeout(&net, write_timeout);
@@ -886,7 +897,9 @@
 
 static int init(drizzled::module::Context &context)
 {  
+  mysql_status_table_function_ptr= new MysqlProtocolStatus;
 
+  context.add(mysql_status_table_function_ptr);
   /* Initialize random seeds for the MySQL algorithm with minimal changes. */
   time_t seed_time= time(NULL);
   random_seed1= seed_time % random_max;
@@ -1022,6 +1035,103 @@
   NULL
 };
 
+static int mysql_protocol_connection_count_func(drizzle_show_var *var, char *buff)
+{
+  var->type= SHOW_LONGLONG;
+  var->value= buff;
+  *((uint64_t *)buff)= ClientMySQLProtocol::connectionCount;
+  return 0;
+}
+
+static int mysql_protocol_connected_count_func(drizzle_show_var *var, char *buff)
+{
+  var->type= SHOW_LONGLONG;
+  var->value= buff;
+  *((uint64_t *)buff)= ClientMySQLProtocol::connected;
+  return 0;
+}
+
+static int mysql_protocol_failed_count_func(drizzle_show_var *var, char *buff)
+{
+  var->type= SHOW_LONGLONG;
+  var->value= buff;
+  *((uint64_t *)buff)= ClientMySQLProtocol::failedConnections;
+  return 0;
+}
+
+static st_show_var_func_container mysql_protocol_connection_count=
+  { &mysql_protocol_connection_count_func };
+
+static st_show_var_func_container mysql_protocol_connected_count=
+  { &mysql_protocol_connected_count_func };
+
+static st_show_var_func_container mysql_protocol_failed_count=
+  { &mysql_protocol_failed_count_func };
+
+static drizzle_show_var mysql_protocol_status_variables[]= {
+  {"Connections",
+  (char*) &mysql_protocol_connection_count, SHOW_FUNC},
+  {"Connected",
+  (char*) &mysql_protocol_connected_count, SHOW_FUNC},
+  {"Failed_connections",
+  (char*) &mysql_protocol_failed_count, SHOW_FUNC},
+  {NULL, NULL, SHOW_LONGLONG}
+};
+
+MysqlProtocolStatus::Generator::Generator(drizzled::Field **fields) :
+  plugin::TableFunction::Generator(fields)
+{
+  status_var_ptr= mysql_protocol_status_variables;
+}
+
+bool MysqlProtocolStatus::Generator::populate()
+{
+  MY_ALIGNED_BYTE_ARRAY(buff_data, SHOW_VAR_FUNC_BUFF_SIZE, int64_t);
+  char * const buff= (char *) &buff_data;
+  drizzle_show_var tmp;
+
+  if (status_var_ptr->name)
+  {
+    std::ostringstream oss;
+    string return_value;
+    const char *value;
+    int type;
+
+    push(status_var_ptr->name);
+
+    if (status_var_ptr->type == SHOW_FUNC)
+    {
+      ((mysql_show_var_func)((st_show_var_func_container *)status_var_ptr->value)->func)(&tmp, buff);
+      value= buff;
+      type= tmp.type;
+    }
+    else
+    {
+      value= status_var_ptr->value;
+      type= status_var_ptr->type;
+    }
+
+    switch(type)
+    {
+    case SHOW_LONGLONG:
+      oss << *(uint64_t*) value;
+      return_value= oss.str();
+      break;
+    default:
+      assert(0);
+    }
+    if (return_value.length())
+      push(return_value);
+    else
+      push(" ");
+
+    status_var_ptr++;
+
+    return true;
+  }
+  return false;
+}
+
 DRIZZLE_DECLARE_PLUGIN
 {
   DRIZZLE_VERSION_ID,

=== modified file 'plugin/mysql_protocol/mysql_protocol.h'
--- plugin/mysql_protocol/mysql_protocol.h	2010-08-12 06:10:25 +0000
+++ plugin/mysql_protocol/mysql_protocol.h	2010-09-09 06:18:43 +0000
@@ -22,6 +22,8 @@
 
 #include <drizzled/plugin/listen_tcp.h>
 #include <drizzled/plugin/client.h>
+#include <drizzled/atomics.h>
+#include "drizzled/plugin/table_function.h"
 
 #include "net_serv.h"
 
@@ -29,6 +31,7 @@
 {
 private:
   bool using_mysql41_protocol;
+  static drizzled::plugin::TableFunction* status_table_function_ptr;
 
 public:
   ListenMySQLProtocol(std::string name_arg, bool using_mysql41_protocol_arg):
@@ -59,6 +62,10 @@
   ClientMySQLProtocol(int fd, bool using_mysql41_protocol_arg);
   virtual ~ClientMySQLProtocol();
 
+  static drizzled::atomic<uint64_t> connectionCount;
+  static drizzled::atomic<uint64_t> failedConnections;
+  static drizzled::atomic<uint64_t> connected;
+
   virtual int getFileDescriptor(void);
   virtual bool isConnected();
   virtual bool isReading(void);

=== modified file 'plugin/mysql_protocol/plugin.ini'
--- plugin/mysql_protocol/plugin.ini	2010-04-27 21:03:13 +0000
+++ plugin/mysql_protocol/plugin.ini	2010-09-09 06:18:43 +0000
@@ -4,6 +4,6 @@
 load_by_default=yes
 ldlfags=$(LIBZ)
 libs=drizzled/algorithm/libhash.la
-headers=mysql_protocol.h errmsg.h net_serv.h options.h vio.h mysql_password.h
+headers=mysql_protocol.h errmsg.h net_serv.h options.h vio.h mysql_password.h table_function.h
 sources=mysql_protocol.cc net_serv.cc vio.cc mysql_password.cc
 static=yes

=== added file 'plugin/mysql_protocol/table_function.h'
--- plugin/mysql_protocol/table_function.h	1970-01-01 00:00:00 +0000
+++ plugin/mysql_protocol/table_function.h	2010-09-09 06:18:43 +0000
@@ -0,0 +1,52 @@
+/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2010 Andrew Hutchings
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PLUGIN_MYSQL_PROTOCOL_TABLE_FUNCTION_H
+#define PLUGIN_MYSQL_PROTOCOL_TABLE_FUNCTION_H
+
+#include "drizzled/plugin/table_function.h"
+
+class MysqlProtocolStatus : public drizzled::plugin::TableFunction
+{
+public:
+  MysqlProtocolStatus() :
+    drizzled::plugin::TableFunction("DATA_DICTIONARY","MYSQL_PROTOCOL_STATUS")
+  {
+    add_field("VARIABLE_NAME");
+    add_field("VARIABLE_VALUE");
+  }
+
+  class Generator : public drizzled::plugin::TableFunction::Generator
+  {
+    drizzled::drizzle_show_var *status_var_ptr;
+
+  public:
+    Generator(drizzled::Field **fields);
+
+    bool populate();
+  };
+
+  Generator *generator(drizzled::Field **arg)
+  {
+    return new Generator(arg);
+  }
+};
+
+#endif /* PLUGIN_MYSQL_PROTOCOL_TABLE_FUNCTION_H */

=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
--- plugin/schema_dictionary/tests/r/data_dictionary.result	2010-09-02 18:35:05 +0000
+++ plugin/schema_dictionary/tests/r/data_dictionary.result	2010-09-09 06:18:43 +0000
@@ -1,7 +1,7 @@
 use data_dictionary;
 SELECT count(*) FROM columns;
 count(*)
-490
+494
 SELECT count(*) FROM indexes;
 count(*)
 0
@@ -489,6 +489,10 @@
 VARIABLE_NAME
 VARIABLE_NAME
 VARIABLE_NAME
+VARIABLE_NAME
+VARIABLE_NAME
+VARIABLE_VALUE
+VARIABLE_VALUE
 VARIABLE_VALUE
 VARIABLE_VALUE
 VARIABLE_VALUE
@@ -687,6 +691,8 @@
 DATA_DICTIONARY	CURRENT_SQL_COMMANDS	COUNT_UPDATE
 DATA_DICTIONARY	CURRENT_SQL_COMMANDS	IP
 DATA_DICTIONARY	CURRENT_SQL_COMMANDS	USER
+DATA_DICTIONARY	DRIZZLE_PROTOCOL_STATUS	VARIABLE_NAME
+DATA_DICTIONARY	DRIZZLE_PROTOCOL_STATUS	VARIABLE_VALUE
 DATA_DICTIONARY	GLOBAL_STATEMENTS	VARIABLE_NAME
 DATA_DICTIONARY	GLOBAL_STATEMENTS	VARIABLE_VALUE
 DATA_DICTIONARY	GLOBAL_STATUS	VARIABLE_NAME
@@ -767,6 +773,8 @@
 DATA_DICTIONARY	MODULES	MODULE_LICENSE
 DATA_DICTIONARY	MODULES	MODULE_NAME
 DATA_DICTIONARY	MODULES	MODULE_VERSION
+DATA_DICTIONARY	MYSQL_PROTOCOL_STATUS	VARIABLE_NAME
+DATA_DICTIONARY	MYSQL_PROTOCOL_STATUS	VARIABLE_VALUE
 DATA_DICTIONARY	PLUGINS	IS_ACTIVE
 DATA_DICTIONARY	PLUGINS	MODULE_NAME
 DATA_DICTIONARY	PLUGINS	PLUGIN_NAME
@@ -1259,6 +1267,8 @@
 DOMAIN_CONSTRAINTS	INFORMATION_SCHEMA	DOMAIN_SCHEMA
 DOMAIN_CONSTRAINTS	INFORMATION_SCHEMA	INITIALLY_DEFERRED
 DOMAIN_CONSTRAINTS	INFORMATION_SCHEMA	IS_DEFERRABLE
+DRIZZLE_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_NAME
+DRIZZLE_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_VALUE
 GLOBAL_STATEMENTS	DATA_DICTIONARY	VARIABLE_NAME
 GLOBAL_STATEMENTS	DATA_DICTIONARY	VARIABLE_VALUE
 GLOBAL_STATUS	DATA_DICTIONARY	VARIABLE_NAME
@@ -1347,6 +1357,8 @@
 MODULES	DATA_DICTIONARY	MODULE_LICENSE
 MODULES	DATA_DICTIONARY	MODULE_NAME
 MODULES	DATA_DICTIONARY	MODULE_VERSION
+MYSQL_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_NAME
+MYSQL_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_VALUE
 PARAMETERS	INFORMATION_SCHEMA	AS_LOCATOR
 PARAMETERS	INFORMATION_SCHEMA	CHARACTER_MAXIMUM_LENGTH
 PARAMETERS	INFORMATION_SCHEMA	CHARACTER_OCTET_LENGTH
@@ -1752,6 +1764,8 @@
 DOMAIN_CONSTRAINTS	INFORMATION_SCHEMA	DOMAIN_SCHEMA
 DOMAIN_CONSTRAINTS	INFORMATION_SCHEMA	INITIALLY_DEFERRED
 DOMAIN_CONSTRAINTS	INFORMATION_SCHEMA	IS_DEFERRABLE
+DRIZZLE_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_NAME
+DRIZZLE_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_VALUE
 GLOBAL_STATEMENTS	DATA_DICTIONARY	VARIABLE_NAME
 GLOBAL_STATEMENTS	DATA_DICTIONARY	VARIABLE_VALUE
 GLOBAL_STATUS	DATA_DICTIONARY	VARIABLE_NAME
@@ -1840,6 +1854,8 @@
 MODULES	DATA_DICTIONARY	MODULE_LICENSE
 MODULES	DATA_DICTIONARY	MODULE_NAME
 MODULES	DATA_DICTIONARY	MODULE_VERSION
+MYSQL_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_NAME
+MYSQL_PROTOCOL_STATUS	DATA_DICTIONARY	VARIABLE_VALUE
 PARAMETERS	INFORMATION_SCHEMA	AS_LOCATOR
 PARAMETERS	INFORMATION_SCHEMA	CHARACTER_MAXIMUM_LENGTH
 PARAMETERS	INFORMATION_SCHEMA	CHARACTER_OCTET_LENGTH

=== modified file 'plugin/session_dictionary/processlist.cc'
--- plugin/session_dictionary/processlist.cc	2010-08-13 23:46:13 +0000
+++ plugin/session_dictionary/processlist.cc	2010-09-09 06:18:43 +0000
@@ -44,8 +44,8 @@
   add_field("DB");
   add_field("COMMAND", 16);
   add_field("TIME", plugin::TableFunction::NUMBER, 0, false);
-  add_field("STATE");
-  add_field("INFO", PROCESS_LIST_WIDTH);
+  add_field("STATE", plugin::TableFunction::STRING, 256, true);
+  add_field("INFO", plugin::TableFunction::STRING, PROCESS_LIST_WIDTH, true);
 }
 
 ProcesslistTool::Generator::Generator(Field **arg) :

=== modified file 'plugin/session_dictionary/tests/r/data_dictionary.result'
--- plugin/session_dictionary/tests/r/data_dictionary.result	2010-09-02 18:35:05 +0000
+++ plugin/session_dictionary/tests/r/data_dictionary.result	2010-09-09 06:18:43 +0000
@@ -8,8 +8,8 @@
   `DB` VARCHAR(256) NOT NULL,
   `COMMAND` VARCHAR(16) NOT NULL,
   `TIME` BIGINT NOT NULL,
-  `STATE` VARCHAR(256) NOT NULL,
-  `INFO` VARCHAR(100) NOT NULL
+  `STATE` VARCHAR(256) DEFAULT NULL,
+  `INFO` VARCHAR(100) DEFAULT NULL
 ) ENGINE=FunctionEngine COLLATE = utf8_general_ci
 SELECT ID FROM processlist;
 ID

=== modified file 'tests/r/create.result'
--- tests/r/create.result	2010-09-02 18:35:05 +0000
+++ tests/r/create.result	2010-09-09 06:18:43 +0000
@@ -1455,8 +1455,8 @@
   `DB` VARCHAR(256) NOT NULL,
   `COMMAND` VARCHAR(16) NOT NULL,
   `TIME` BIGINT NOT NULL,
-  `STATE` VARCHAR(256) NOT NULL,
-  `INFO` VARCHAR(100) NOT NULL
+  `STATE` VARCHAR(256) DEFAULT NULL,
+  `INFO` VARCHAR(100) DEFAULT NULL
 ) ENGINE=InnoDB COLLATE = utf8_general_ci
 drop table t1;
 create temporary table t1 like data_dictionary.processlist;
@@ -1471,8 +1471,8 @@
   `DB` VARCHAR(256) NOT NULL,
   `COMMAND` VARCHAR(16) NOT NULL,
   `TIME` BIGINT NOT NULL,
-  `STATE` VARCHAR(256) NOT NULL,
-  `INFO` VARCHAR(100) NOT NULL
+  `STATE` VARCHAR(256) DEFAULT NULL,
+  `INFO` VARCHAR(100) DEFAULT NULL
 ) ENGINE=MyISAM COLLATE = utf8_general_ci
 drop table t1;
 

=== modified file 'tests/r/data_dictionary_like_info.result'
--- tests/r/data_dictionary_like_info.result	2010-07-29 00:34:46 +0000
+++ tests/r/data_dictionary_like_info.result	2010-09-09 06:18:43 +0000
@@ -191,7 +191,7 @@
  or DATA_TYPE = 'varchar')
 group by DATA_TYPE order by DATA_TYPE, num;
 DATA_TYPE	a	num
-VARCHAR	#	161
+VARCHAR	#	165
 Warnings:
 Warning	#	1 line(s) were cut by GROUP_CONCAT()
 create table t1(f1 char(1) not null, f2 char(9) not null);

=== modified file 'tests/r/information_schema.result'
--- tests/r/information_schema.result	2010-08-27 00:24:53 +0000
+++ tests/r/information_schema.result	2010-09-09 06:18:43 +0000
@@ -91,7 +91,7 @@
 table_name NOT LIKE 'falcon%'
 GROUP BY TABLE_SCHEMA ORDER BY table_schema;
 table_schema	count(*)
-DATA_DICTIONARY	40
+DATA_DICTIONARY	42
 INFORMATION_SCHEMA	20
 create table t1(f1 LONGBLOB, f2 LONGTEXT);
 select column_name,data_type,CHARACTER_OCTET_LENGTH,
@@ -193,6 +193,7 @@
 CUMULATIVE_SQL_COMMANDS	COUNT_SELECT
 CUMULATIVE_USER_STATS	BYTES_RECEIVED
 CURRENT_SQL_COMMANDS	IP
+DRIZZLE_PROTOCOL_STATUS	VARIABLE_VALUE
 GLOBAL_STATEMENTS	VARIABLE_VALUE
 GLOBAL_STATUS	VARIABLE_VALUE
 GLOBAL_VARIABLES	VARIABLE_VALUE
@@ -207,6 +208,7 @@
 INNODB_STATUS	VARIABLE_VALUE
 INNODB_TRX	TRX_STATE
 MODULES	MODULE_VERSION
+MYSQL_PROTOCOL_STATUS	VARIABLE_VALUE
 PLUGINS	PLUGIN_TYPE
 PROCESSLIST	USER
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
@@ -248,6 +250,7 @@
 CUMULATIVE_SQL_COMMANDS	COUNT_SELECT
 CUMULATIVE_USER_STATS	BYTES_RECEIVED
 CURRENT_SQL_COMMANDS	IP
+DRIZZLE_PROTOCOL_STATUS	VARIABLE_VALUE
 GLOBAL_STATEMENTS	VARIABLE_VALUE
 GLOBAL_STATUS	VARIABLE_VALUE
 GLOBAL_VARIABLES	VARIABLE_VALUE
@@ -262,6 +265,7 @@
 INNODB_STATUS	VARIABLE_VALUE
 INNODB_TRX	TRX_STATE
 MODULES	MODULE_VERSION
+MYSQL_PROTOCOL_STATUS	VARIABLE_VALUE
 PLUGINS	PLUGIN_TYPE
 PROCESSLIST	USER
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA