Merge lp:~brianaker/drizzle/bug-fix-654219 into lp:~drizzle-trunk/drizzle/development

[Brian Aker]

This fixes bug 654219.

[Lee Bieber (kalebral-deactivatedaccount)]

Need to re-merge with trunk getting conflicts.

=== modified file 'plugin/drizzle_protocol/drizzle_protocol.cc'
--- plugin/drizzle_protocol/drizzle_protocol.cc	2010-10-02 21:15:42 +0000
+++ plugin/drizzle_protocol/drizzle_protocol.cc	2010-10-06 01:14:00 +0000
@@ -1,6 +1,7 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
+<<<<<<< TREE
  *  Copyright (C) 2008 Sun Microsystems
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,8 +16,26 @@
  * 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
+=======
+ *  Copyright (C) 2010 Brian Aker
+ *
+ *  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
+>>>>>>> MERGE-SOURCE
  */
 
+
 #include "config.h"
 #include <drizzled/gettext.h>
 #include <drizzled/error.h>
@@ -29,13 +48,8 @@
 #include <iostream>
 #include <boost/program_options.hpp>
 #include <drizzled/module/option_map.h>
-#include "pack.h"
-#include "errmsg.h"
 #include "drizzle_protocol.h"
-#include "options.h"
-#include "table_function.h"
-
-#define PROTOCOL_VERSION 10
+#include "plugin/drizzle_protocol/status_table.h"
 
 namespace po= boost::program_options;
 using namespace drizzled;
@@ -44,18 +58,15 @@
 namespace drizzle_protocol
 {
 
-
-static const uint32_t DRIZZLE_TCP_PORT= 4427;
-static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;
 static uint32_t port;
 static uint32_t connect_timeout;
 static uint32_t read_timeout;
 static uint32_t write_timeout;
 static uint32_t retry_count;
 static uint32_t buffer_length;
-static char* bind_address= NULL;
+static char* bind_address;
 
-static plugin::TableFunction* drizzle_status_table_function_ptr= NULL;
+static const uint32_t DRIZZLE_TCP_PORT= 4427;
 
 ListenDrizzleProtocol::~ListenDrizzleProtocol()
 {
@@ -70,770 +81,11 @@
 
 in_port_t ListenDrizzleProtocol::getPort(void) const
 {
-  char *env;
-
-  if (port == 0)
-  {
-    port= DRIZZLE_TCP_PORT;
-
-    if ((env = getenv("DRIZZLE_TCP_PORT")))
-      port= (uint32_t) atoi(env);
-
-    assert(port != 0);
-  }
-
   return (in_port_t) port;
 }
 
-plugin::Client *ListenDrizzleProtocol::getClient(int fd)
-{
-  int new_fd;
-  new_fd= acceptTcp(fd);
-  if (new_fd == -1)
-    return NULL;
-
-  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)
-{
-  net.vio= 0;
-
-  if (fd == -1)
-    return;
-
-  if (drizzleclient_net_init_sock(&net, fd, 0, buffer_length))
-    throw bad_alloc();
-
-  drizzleclient_net_set_read_timeout(&net, read_timeout);
-  drizzleclient_net_set_write_timeout(&net, write_timeout);
-  net.retry_count=retry_count;
-}
-
-ClientDrizzleProtocol::~ClientDrizzleProtocol()
-{
-  if (net.vio)
-    drizzleclient_vio_close(net.vio);
-}
-
-int ClientDrizzleProtocol::getFileDescriptor(void)
-{
-  return drizzleclient_net_get_sd(&net);
-}
-
-bool ClientDrizzleProtocol::isConnected()
-{
-  return net.vio != 0;
-}
-
-bool ClientDrizzleProtocol::isReading(void)
-{
-  return net.reading_or_writing == 1;
-}
-
-bool ClientDrizzleProtocol::isWriting(void)
-{
-  return net.reading_or_writing == 2;
-}
-
-bool ClientDrizzleProtocol::flush()
-{
-  if (net.vio == NULL)
-    return false;
-  bool ret= drizzleclient_net_write(&net, (unsigned char*) packet.ptr(),
-                           packet.length());
-  packet.length(0);
-  return ret;
-}
-
-void ClientDrizzleProtocol::close(void)
-{
-  if (net.vio)
-  { 
-    drizzleclient_net_close(&net);
-    drizzleclient_net_end(&net);
-    connected.decrement();
-  }
-}
-
-bool ClientDrizzleProtocol::authenticate()
-{
-  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);
-
-  connection_is_valid= checkConnection();
-
-  if (connection_is_valid)
-    sendOK();
-  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);
-  return true;
-}
-
-bool ClientDrizzleProtocol::readCommand(char **l_packet, uint32_t *packet_length)
-{
-  /*
-    This thread will do a blocking read from the client which
-    will be interrupted when the next command is received from
-    the client, the connection is closed or "net_wait_timeout"
-    number of seconds has passed
-  */
-#ifdef NEVER
-  /* We can do this much more efficiently with poll timeouts or watcher thread,
-     disabling for now, which means net_wait_timeout == read_timeout. */
-  drizzleclient_net_set_read_timeout(&net,
-                                     session->variables.net_wait_timeout);
-#endif
-
-  net.pkt_nr=0;
-
-  *packet_length= drizzleclient_net_read(&net);
-  if (*packet_length == packet_error)
-  {
-    /* Check if we can continue without closing the connection */
-
-    if(net.last_errno== CR_NET_PACKET_TOO_LARGE)
-      my_error(ER_NET_PACKET_TOO_LARGE, MYF(0));
-    if (session->main_da.status() == Diagnostics_area::DA_ERROR)
-      sendError(session->main_da.sql_errno(), session->main_da.message());
-    else
-      sendOK();
-
-    if (net.error != 3)
-      return false;                       // We have to close it.
-
-    net.error= 0;
-    *packet_length= 0;
-    return true;
-  }
-
-  *l_packet= (char*) net.read_pos;
-
-  /*
-    'packet_length' contains length of data, as it was stored in packet
-    header. In case of malformed header, drizzleclient_net_read returns zero.
-    If packet_length is not zero, drizzleclient_net_read ensures that the returned
-    number of bytes was actually read from network.
-    There is also an extra safety measure in drizzleclient_net_read:
-    it sets packet[packet_length]= 0, but only for non-zero packets.
-  */
-
-  if (*packet_length == 0)                       /* safety */
-  {
-    /* Initialize with COM_SLEEP packet */
-    (*l_packet)[0]= (unsigned char) COM_SLEEP;
-    *packet_length= 1;
-  }
-  else if (using_mysql41_protocol)
-  {
-    /* Map from MySQL commands to Drizzle commands. */
-    switch ((int)(*l_packet)[0])
-    {
-    case 0: /* SLEEP */
-    case 1: /* QUIT */
-    case 2: /* INIT_DB */
-    case 3: /* QUERY */
-      break;
-
-    case 8: /* SHUTDOWN */
-      (*l_packet)[0]= (unsigned char) COM_SHUTDOWN;
-      break;
-
-    case 14: /* PING */
-      (*l_packet)[0]= (unsigned char) COM_SHUTDOWN;
-      break;
-
-
-    default:
-      /* Just drop connection for MySQL commands we don't support. */
-      (*l_packet)[0]= (unsigned char) COM_QUIT;
-      *packet_length= 1;
-      break;
-    }
-  }
-
-  /* Do not rely on drizzleclient_net_read, extra safety against programming errors. */
-  (*l_packet)[*packet_length]= '\0';                  /* safety */
-
-#ifdef NEVER
-  /* See comment above. */
-  /* Restore read timeout value */
-  drizzleclient_net_set_read_timeout(&net,
-                                     session->variables.net_read_timeout);
-#endif
-
-  return true;
-}
-
-/**
-  Return ok to the client.
-
-  The ok packet has the following structure:
-
-  - 0               : Marker (1 byte)
-  - affected_rows    : Stored in 1-9 bytes
-  - id        : Stored in 1-9 bytes
-  - server_status    : Copy of session->server_status;  Can be used by client
-  to check if we are inside an transaction.
-  New in 4.0 client
-  - warning_count    : Stored in 2 bytes; New in 4.1 client
-  - message        : Stored as packed length (1-9 bytes) + message.
-  Is not stored if no message.
-
-  @param session           Thread handler
-  @param affected_rows       Number of rows changed by statement
-  @param id           Auto_increment id for first row (if used)
-  @param message       Message to send to the client (Used by mysql_status)
-*/
-
-void ClientDrizzleProtocol::sendOK()
-{
-  unsigned char buff[DRIZZLE_ERRMSG_SIZE+10],*pos;
-  const char *message= NULL;
-  uint32_t tmp;
-
-  if (!net.vio)    // hack for re-parsing queries
-  {
-    return;
-  }
-
-  buff[0]=0;                    // No fields
-  if (session->main_da.status() == Diagnostics_area::DA_OK)
-  {
-    if (client_capabilities & CLIENT_FOUND_ROWS && session->main_da.found_rows())
-      pos=drizzleclient_net_store_length(buff+1,session->main_da.found_rows());
-    else
-      pos=drizzleclient_net_store_length(buff+1,session->main_da.affected_rows());
-    pos=drizzleclient_net_store_length(pos, session->main_da.last_insert_id());
-    int2store(pos, session->main_da.server_status());
-    pos+=2;
-    tmp= min(session->main_da.total_warn_count(), (uint32_t)65535);
-    message= session->main_da.message();
-  }
-  else
-  {
-    pos=drizzleclient_net_store_length(buff+1,0);
-    pos=drizzleclient_net_store_length(pos, 0);
-    int2store(pos, session->server_status);
-    pos+=2;
-    tmp= min(session->total_warn_count, (uint32_t)65535);
-  }
-
-  /* We can only return up to 65535 warnings in two bytes */
-  int2store(pos, tmp);
-  pos+= 2;
-
-  session->main_da.can_overwrite_status= true;
-
-  if (message && message[0])
-  {
-    size_t length= strlen(message);
-    pos=drizzleclient_net_store_length(pos,length);
-    memcpy(pos,(unsigned char*) message,length);
-    pos+=length;
-  }
-  drizzleclient_net_write(&net, buff, (size_t) (pos-buff));
-  drizzleclient_net_flush(&net);
-
-  session->main_da.can_overwrite_status= false;
-}
-
-/**
-  Send eof (= end of result set) to the client.
-
-  The eof packet has the following structure:
-
-  - 254    (DRIZZLE_PROTOCOL_NO_MORE_DATA)    : Marker (1 byte)
-  - warning_count    : Stored in 2 bytes; New in 4.1 client
-  - status_flag    : Stored in 2 bytes;
-  For flags like SERVER_MORE_RESULTS_EXISTS.
-
-  Note that the warning count will not be sent if 'no_flush' is set as
-  we don't want to report the warning count until all data is sent to the
-  client.
-*/
-
-void ClientDrizzleProtocol::sendEOF()
-{
-  /* Set to true if no active vio, to work well in case of --init-file */
-  if (net.vio != 0)
-  {
-    session->main_da.can_overwrite_status= true;
-    writeEOFPacket(session->main_da.server_status(),
-                   session->main_da.total_warn_count());
-    drizzleclient_net_flush(&net);
-    session->main_da.can_overwrite_status= false;
-  }
-  packet.shrink(buffer_length);
-}
-
-
-void ClientDrizzleProtocol::sendError(uint32_t sql_errno, const char *err)
-{
-  uint32_t length;
-  /*
-    buff[]: sql_errno:2 + ('#':1 + SQLSTATE_LENGTH:5) + DRIZZLE_ERRMSG_SIZE:512
-  */
-  unsigned char buff[2+1+SQLSTATE_LENGTH+DRIZZLE_ERRMSG_SIZE], *pos;
-
-  assert(sql_errno);
-  assert(err && err[0]);
-
-  /*
-    It's one case when we can push an error even though there
-    is an OK or EOF already.
-  */
-  session->main_da.can_overwrite_status= true;
-
-  /* Abort multi-result sets */
-  session->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
-
-  /**
-    Send a error string to client.
-
-    For SIGNAL/RESIGNAL and GET DIAGNOSTICS functionality it's
-    critical that every error that can be intercepted is issued in one
-    place only, my_message_sql.
-  */
-
-  if (net.vio == 0)
-  {
-    return;
-  }
-
-  int2store(buff,sql_errno);
-  pos= buff+2;
-
-  /* The first # is to make the client backward compatible */
-  buff[2]= '#';
-  pos= (unsigned char*) strcpy((char*) buff+3, drizzle_errno_to_sqlstate(sql_errno));
-  pos+= strlen(drizzle_errno_to_sqlstate(sql_errno));
-
-  char *tmp= strncpy((char*)pos, err, DRIZZLE_ERRMSG_SIZE-1);
-  tmp+= strlen((char*)pos);
-  tmp[0]= '\0';
-  length= (uint32_t)(tmp-(char*)buff);
-  err= (char*) buff;
-
-  drizzleclient_net_write_command(&net,(unsigned char) 255, (unsigned char*) "", 0, (unsigned char*) err, length);
-
-  session->main_da.can_overwrite_status= false;
-}
-
-/**
-  Send name and type of result to client.
-
-  Sum fields has table name empty and field_name.
-
-  @param Session        Thread data object
-  @param list            List of items to send to client
-  @param flag            Bit mask with the following functions:
-                        - 1 send number of rows
-                        - 2 send default values
-                        - 4 don't write eof packet
-
-  @retval
-    0    ok
-  @retval
-    1    Error  (Note that in this case the error is not sent to the
-    client)
-*/
-bool ClientDrizzleProtocol::sendFields(List<Item> *list)
-{
-  List_iterator_fast<Item> it(*list);
-  Item *item;
-  unsigned char buff[80];
-  String tmp((char*) buff,sizeof(buff),&my_charset_bin);
-
-  unsigned char *row_pos= drizzleclient_net_store_length(buff, list->elements);
-  (void) drizzleclient_net_write(&net, buff, (size_t) (row_pos-buff));
-
-  while ((item=it++))
-  {
-    char *pos;
-    SendField field;
-    item->make_field(&field);
-
-    packet.length(0);
-
-    if (store(STRING_WITH_LEN("def")) ||
-        store(field.db_name) ||
-        store(field.table_name) ||
-        store(field.org_table_name) ||
-        store(field.col_name) ||
-        store(field.org_col_name) ||
-        packet.realloc(packet.length()+12))
-      goto err;
-
-    /* Store fixed length fields */
-    pos= (char*) packet.ptr()+packet.length();
-    *pos++= 12;                // Length of packed fields
-    /* No conversion */
-    int2store(pos, field.charsetnr);
-    int4store(pos+2, field.length);
-
-    if (using_mysql41_protocol)
-    {
-      /* Switch to MySQL field numbering. */
-      switch (field.type)
-      {
-      case DRIZZLE_TYPE_LONG:
-        pos[6]= 3;
-        break;
-
-      case DRIZZLE_TYPE_DOUBLE:
-        pos[6]= 5;
-        break;
-
-      case DRIZZLE_TYPE_NULL:
-        pos[6]= 6;
-        break;
-
-      case DRIZZLE_TYPE_TIMESTAMP:
-        pos[6]= 7;
-        break;
-
-      case DRIZZLE_TYPE_LONGLONG:
-        pos[6]= 8;
-        break;
-
-      case DRIZZLE_TYPE_DATETIME:
-        pos[6]= 12;
-        break;
-
-      case DRIZZLE_TYPE_DATE:
-        pos[6]= 14;
-        break;
-
-      case DRIZZLE_TYPE_VARCHAR:
-        pos[6]= 15;
-        break;
-
-      case DRIZZLE_TYPE_DECIMAL:
-        pos[6]= (char)246;
-        break;
-
-      case DRIZZLE_TYPE_ENUM:
-        pos[6]= (char)247;
-        break;
-
-      case DRIZZLE_TYPE_BLOB:
-        pos[6]= (char)252;
-        break;
-      }
-    }
-    else
-    {
-      /* Add one to compensate for tinyint removal from enum. */
-      pos[6]= field.type + 1;
-    }
-
-    int2store(pos+7,field.flags);
-    pos[9]= (char) field.decimals;
-    pos[10]= 0;                // For the future
-    pos[11]= 0;                // For the future
-    pos+= 12;
-
-    packet.length((uint32_t) (pos - packet.ptr()));
-    if (flush())
-      break;
-  }
-
-  /*
-    Mark the end of meta-data result set, and store session->server_status,
-    to show that there is no cursor.
-    Send no warning information, as it will be sent at statement end.
-  */
-  writeEOFPacket(session->server_status, session->total_warn_count);
-  return 0;
-
-err:
-  my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES),
-             MYF(0));
-  return 1;
-}
-
-bool ClientDrizzleProtocol::store(Field *from)
-{
-  if (from->is_null())
-    return store();
-  char buff[MAX_FIELD_WIDTH];
-  String str(buff,sizeof(buff), &my_charset_bin);
-
-  from->val_str(&str);
-
-  return netStoreData((const unsigned char *)str.ptr(), str.length());
-}
-
-bool ClientDrizzleProtocol::store(void)
-{
-  char buff[1];
-  buff[0]= (char)251;
-  return packet.append(buff, sizeof(buff), PACKET_BUFFER_EXTRA_ALLOC);
-}
-
-bool ClientDrizzleProtocol::store(int32_t from)
-{
-  char buff[12];
-  return netStoreData((unsigned char*) buff,
-                      (size_t) (internal::int10_to_str(from, buff, -10) - buff));
-}
-
-bool ClientDrizzleProtocol::store(uint32_t from)
-{
-  char buff[11];
-  return netStoreData((unsigned char*) buff,
-                      (size_t) (internal::int10_to_str(from, buff, 10) - buff));
-}
-
-bool ClientDrizzleProtocol::store(int64_t from)
-{
-  char buff[22];
-  return netStoreData((unsigned char*) buff,
-                      (size_t) (internal::int64_t10_to_str(from, buff, -10) - buff));
-}
-
-bool ClientDrizzleProtocol::store(uint64_t from)
-{
-  char buff[21];
-  return netStoreData((unsigned char*) buff,
-                      (size_t) (internal::int64_t10_to_str(from, buff, 10) - buff));
-}
-
-bool ClientDrizzleProtocol::store(double from, uint32_t decimals, String *buffer)
-{
-  buffer->set_real(from, decimals, session->charset());
-  return netStoreData((unsigned char*) buffer->ptr(), buffer->length());
-}
-
-bool ClientDrizzleProtocol::store(const char *from, size_t length)
-{
-  return netStoreData((const unsigned char *)from, length);
-}
-
-bool ClientDrizzleProtocol::wasAborted(void)
-{
-  return net.error && net.vio != 0;
-}
-
-bool ClientDrizzleProtocol::haveMoreData(void)
-{
-  return drizzleclient_net_more_data(&net);
-}
-
-bool ClientDrizzleProtocol::haveError(void)
-{
-  return net.error || net.vio == 0;
-}
-
-bool ClientDrizzleProtocol::checkConnection(void)
-{
-  uint32_t pkt_len= 0;
-  char *end;
-
-  // TCP/IP connection
-  {
-    char ip[NI_MAXHOST];
-    uint16_t peer_port;
-
-    if (drizzleclient_net_peer_addr(&net, ip, &peer_port, NI_MAXHOST))
-    {
-      my_error(ER_BAD_HOST_ERROR, MYF(0), session->getSecurityContext().getIp().c_str());
-      return false;
-    }
-
-    session->getSecurityContext().setIp(ip);
-  }
-  drizzleclient_net_keepalive(&net, true);
-
-  uint32_t server_capabilites;
-  {
-    /* buff[] needs to big enough to hold the server_version variable */
-    char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64];
-
-    server_capabilites= CLIENT_BASIC_FLAGS;
-
-    if (using_mysql41_protocol)
-      server_capabilites|= CLIENT_PROTOCOL_MYSQL41;
-
-#ifdef HAVE_COMPRESS
-    server_capabilites|= CLIENT_COMPRESS;
-#endif /* HAVE_COMPRESS */
-
-    end= buff + strlen(PANDORA_RELEASE_VERSION);
-    if ((end - buff) >= SERVER_VERSION_LENGTH)
-      end= buff + (SERVER_VERSION_LENGTH - 1);
-    memcpy(buff, PANDORA_RELEASE_VERSION, end - buff);
-    *end= 0;
-    end++;
-
-    int4store((unsigned char*) end, session->variables.pseudo_thread_id);
-    end+= 4;
-
-    /* We don't use scramble anymore. */
-    memset(end, 'X', SCRAMBLE_LENGTH_323);
-    end+= SCRAMBLE_LENGTH_323;
-    *end++= 0; /* an empty byte for some reason */
-
-    int2store(end, server_capabilites);
-    /* write server characteristics: up to 16 bytes allowed */
-    end[2]=(char) default_charset_info->number;
-    int2store(end+3, session->server_status);
-    memset(end+5, 0, 13);
-    end+= 18;
-
-    /* Write scramble tail. */
-    memset(end, 'X', SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323);
-    end+= (SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323);
-    *end++= 0; /* an empty byte for some reason */
-
-    /* At this point we write connection message and read reply */
-    if (drizzleclient_net_write_command(&net
-          , (unsigned char) PROTOCOL_VERSION
-          , (unsigned char*) ""
-          , 0
-          , (unsigned char*) buff
-          , (size_t) (end-buff)) 
-        ||    (pkt_len= drizzleclient_net_read(&net)) == packet_error 
-        || pkt_len < MIN_HANDSHAKE_SIZE)
-    {
-      my_error(ER_HANDSHAKE_ERROR, MYF(0), session->getSecurityContext().getIp().c_str());
-      return false;
-    }
-  }
-  if (packet.alloc(buffer_length))
-    return false; /* The error is set by alloc(). */
-
-  client_capabilities= uint2korr(net.read_pos);
-
-
-  client_capabilities|= ((uint32_t) uint2korr(net.read_pos + 2)) << 16;
-  session->max_client_packet_length= uint4korr(net.read_pos + 4);
-  end= (char*) net.read_pos + 32;
-
-  /*
-    Disable those bits which are not supported by the server.
-    This is a precautionary measure, if the client lies. See Bug#27944.
-  */
-  client_capabilities&= server_capabilites;
-
-  if (end >= (char*) net.read_pos + pkt_len + 2)
-  {
-    my_error(ER_HANDSHAKE_ERROR, MYF(0), session->getSecurityContext().getIp().c_str());
-    return false;
-  }
-
-  net.return_status= &session->server_status;
-
-  char *user= end;
-  char *passwd= strchr(user, '\0')+1;
-  uint32_t user_len= passwd - user - 1;
-  char *l_db= passwd;
-
-  /*
-    Old clients send null-terminated string as password; new clients send
-    the size (1 byte) + string (not null-terminated). Hence in case of empty
-    password both send '\0'.
-
-    This strlen() can't be easily deleted without changing client.
-
-    Cast *passwd to an unsigned char, so that it doesn't extend the sign for
-    *passwd > 127 and become 2**32-127+ after casting to uint.
-  */
-  uint32_t passwd_len= client_capabilities & CLIENT_SECURE_CONNECTION ?
-    (unsigned char)(*passwd++) : strlen(passwd);
-  l_db= client_capabilities & CLIENT_CONNECT_WITH_DB ? l_db + passwd_len + 1 : 0;
-
-  /* strlen() can't be easily deleted without changing client */
-  uint32_t db_len= l_db ? strlen(l_db) : 0;
-
-  if (passwd + passwd_len + db_len > (char *) net.read_pos + pkt_len)
-  {
-    my_error(ER_HANDSHAKE_ERROR, MYF(0), session->getSecurityContext().getIp().c_str());
-    return false;
-  }
-
-  /* If username starts and ends in "'", chop them off */
-  if (user_len > 1 && user[0] == '\'' && user[user_len - 1] == '\'')
-  {
-    user[user_len-1]= 0;
-    user++;
-    user_len-= 2;
-  }
-
-  session->getSecurityContext().setUser(user);
-
-  return session->checkUser(passwd, passwd_len, l_db);
-}
-
-bool ClientDrizzleProtocol::netStoreData(const unsigned char *from, size_t length)
-{
-  size_t packet_length= packet.length();
-  /*
-     The +9 comes from that strings of length longer than 16M require
-     9 bytes to be stored (see drizzleclient_net_store_length).
-  */
-  if (packet_length+9+length > packet.alloced_length() &&
-      packet.realloc(packet_length+9+length))
-    return 1;
-  unsigned char *to= drizzleclient_net_store_length((unsigned char*) packet.ptr()+packet_length, length);
-  memcpy(to,from,length);
-  packet.length((size_t) (to+length-(unsigned char*) packet.ptr()));
-  return 0;
-}
-
-/**
-  Format EOF packet according to the current client and
-  write it to the network output buffer.
-*/
-
-void ClientDrizzleProtocol::writeEOFPacket(uint32_t server_status,
-                                         uint32_t total_warn_count)
-{
-  unsigned char buff[5];
-  /*
-    Don't send warn count during SP execution, as the warn_list
-    is cleared between substatements, and mysqltest gets confused
-  */
-  uint32_t tmp= min(total_warn_count, (uint32_t)65535);
-  buff[0]= DRIZZLE_PROTOCOL_NO_MORE_DATA;
-  int2store(buff+1, tmp);
-  /*
-    The following test should never be true, but it's better to do it
-    because if 'is_fatal_error' is set the server is not going to execute
-    other queries (see the if test in dispatch_command / COM_QUERY)
-  */
-  if (session->is_fatal_error)
-    server_status&= ~SERVER_MORE_RESULTS_EXISTS;
-  int2store(buff + 3, server_status);
-  drizzleclient_net_write(&net, buff, 5);
-}
-
-static int init(module::Context &context)
-{
-  drizzle_status_table_function_ptr= new DrizzleProtocolStatus;
-
-  context.add(drizzle_status_table_function_ptr);
-
+static int init(drizzled::module::Context &context)
+{  
   const module::option_map &vm= context.getOptions();
   if (vm.count("port"))
   { 
@@ -875,7 +127,7 @@
   {
     if (retry_count < 1 || retry_count > 100)
     {
-      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for retry_count\n"));
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for retry_count"));
       exit(-1);
     }
   }
@@ -898,17 +150,16 @@
   {
     bind_address= NULL;
   }
-  
-  context.add(new ListenDrizzleProtocol("drizzle_protocol", false)); 
+
+  context.add(new StatusTable);
+  context.add(new ListenDrizzleProtocol("drizzle_protocol", true));
+
   return 0;
 }
 
 static DRIZZLE_SYSVAR_UINT(port, port, PLUGIN_VAR_RQCMDARG,
-                           N_("Port number to use for connection or 0 for "
-                              "default to, in order of "
-                              "preference, drizzle.cnf, $DRIZZLE_TCP_PORT, "
-                              "built-in default (4427)."),
-                           NULL, NULL, 0, 0, 65535, 0);
+                           N_("Port number to use for connection or 0 for default to with Drizzle/MySQL protocol."),
+                           NULL, NULL, DRIZZLE_TCP_PORT, 0, 65535, 0);
 static DRIZZLE_SYSVAR_UINT(connect_timeout, connect_timeout,
                            PLUGIN_VAR_RQCMDARG, N_("Connect Timeout."),
                            NULL, NULL, 10, 1, 300, 0);
@@ -927,11 +178,8 @@
 static void init_options(drizzled::module::option_context &context)
 {
   context("port",
-          po::value<uint32_t>(&port)->default_value(0),
-          N_("Port number to use for connection or 0 for "
-                              "default to, in order of "
-                              "preference, drizzle.cnf, $DRIZZLE_TCP_PORT, "
-                              "built-in default (4427)."));
+          po::value<uint32_t>(&port)->default_value(DRIZZLE_TCP_PORT),
+          N_("Port number to use for connection or 0 for default to with Drizzle/MySQL protocol."));
   context("connect-timeout",
           po::value<uint32_t>(&connect_timeout)->default_value(10),
           N_("Connect Timeout."));
@@ -963,103 +211,6 @@
   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-09-01 19:17:03 +0000
+++ plugin/drizzle_protocol/drizzle_protocol.h	2010-10-06 01:14:00 +0000
@@ -1,11 +1,12 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
- *  Copyright (C) 2008 Sun Microsystems
+ *  Copyright (C) 2010 Brian Aker
  *
  *  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; version 2 of the License.
+ *  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
@@ -17,6 +18,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+
 #ifndef PLUGIN_DRIZZLE_PROTOCOL_DRIZZLE_PROTOCOL_H
 #define PLUGIN_DRIZZLE_PROTOCOL_DRIZZLE_PROTOCOL_H
 
@@ -25,77 +27,24 @@
 #include <drizzled/atomics.h>
 #include "drizzled/plugin/table_function.h"
 
-#include "net_serv.h"
+#include "plugin/mysql_protocol/mysql_protocol.h"
 
 namespace drizzle_protocol
 {
 
-class ListenDrizzleProtocol: public drizzled::plugin::ListenTcp
+class ListenDrizzleProtocol: public ListenMySQLProtocol
 {
-private:
-  bool using_mysql41_protocol;
-
 public:
   ListenDrizzleProtocol(std::string name_arg, bool using_mysql41_protocol_arg):
-   drizzled::plugin::ListenTcp(name_arg),
-   using_mysql41_protocol(using_mysql41_protocol_arg)
+    ListenMySQLProtocol(name_arg, using_mysql41_protocol_arg)
   { }
-  virtual ~ListenDrizzleProtocol();
-  virtual const char* getHost(void) const;
-  virtual in_port_t getPort(void) const;
-  virtual drizzled::plugin::Client *getClient(int fd);
-};
-
-class ClientDrizzleProtocol: public drizzled::plugin::Client
-{
-private:
-  NET net;
-  drizzled::String packet;
-  uint32_t client_capabilities;
-  bool using_mysql41_protocol;
-
-  bool checkConnection(void);
-  bool netStoreData(const unsigned char *from, size_t length);
-  void writeEOFPacket(uint32_t server_status, uint32_t total_warn_count);
-
-public:
-  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);
-  virtual bool isWriting(void);
-  virtual bool flush(void);
-  virtual void close(void);
-
-  virtual bool authenticate(void);
-  virtual bool readCommand(char **packet, uint32_t *packet_length);
-
-  virtual void sendOK(void);
-  virtual void sendEOF(void);
-  virtual void sendError(uint32_t sql_errno, const char *err);
-
-  virtual bool sendFields(drizzled::List<drizzled::Item> *list);
-
-  using Client::store;
-  virtual bool store(drizzled::Field *from);
-  virtual bool store(void);
-  virtual bool store(int32_t from);
-  virtual bool store(uint32_t from);
-  virtual bool store(int64_t from);
-  virtual bool store(uint64_t from);
-  virtual bool store(double from, uint32_t decimals, drizzled::String *buffer);
-  virtual bool store(const char *from, size_t length);
-
-  virtual bool haveError(void);
-  virtual bool haveMoreData(void);
-  virtual bool wasAborted(void);
-};
+
+  ~ListenDrizzleProtocol();
+
+  const char* getHost(void) const;
+  in_port_t getPort(void) const;
+};
+
 
 } /* namespace drizzle_protocol */
 

=== modified file 'plugin/drizzle_protocol/errmsg.cc'
--- plugin/drizzle_protocol/errmsg.cc	2010-03-04 18:06:27 +0000
+++ plugin/drizzle_protocol/errmsg.cc	2010-10-06 01:14:00 +0000
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/* Error messages for MySQL clients */
+/*  Stub file for error messages */
 
 #include "config.h"
 #include <drizzled/gettext.h>
@@ -25,96 +25,4 @@
 
 namespace drizzle_protocol
 {
-
-static const char *client_errors[]=
-{
-  N_("Unknown Drizzle error"),
-  N_("Can't create UNIX socket (%d)"),
-  N_("Can't connect to local Drizzle server through socket '%-.100s' (%d)"),
-  N_("Can't connect to Drizzle server on '%-.100s:%lu' (%d)"),
-  N_("Can't create TCP/IP socket (%d)"),
-  N_("Unknown Drizzle server host '%-.100s' (%d)"),
-  N_("Drizzle server has gone away"),
-  N_("Protocol mismatch; server version = %d, client version = %d"),
-  N_("Drizzle client ran out of memory"),
-  N_("Wrong host info"),
-  N_("Localhost via UNIX socket"),
-  N_("%-.100s via TCP/IP"),
-  N_("Error in server handshake"),
-  N_("Lost connection to Drizzle server during query"),
-  N_("Commands out of sync; you can't run this command now"),
-  N_("Named pipe: %-.32s"),
-  N_("Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)"),
-  N_("Can't open named pipe to host: %-.64s  pipe: %-.32s (%lu)"),
-  N_("Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)"),
-  N_("Can't initialize character set %-.32s (path: %-.100s)"),
-  N_("Got packet bigger than 'max_allowed_packet' bytes"),
-  N_("Embedded server"),
-  N_("Error on SHOW SLAVE STATUS:"),
-  N_("Error on SHOW SLAVE HOSTS:"),
-  N_("Error connecting to slave:"),
-  N_("Error connecting to master:"),
-  N_("SSL connection error"),
-  N_("Malformed packet"),
-  N_("(unused error message)"),
-  N_("Invalid use of null pointer"),
-  N_("Statement not prepared"),
-  N_("No data supplied for parameters in prepared statement"),
-  N_("Data truncated"),
-  N_("No parameters exist in the statement"),
-  N_("Invalid parameter number"),
-  N_("Can't send long data for non-string/non-binary data types "
-     "(parameter: %d)"),
-  N_("Using unsupported buffer type: %d  (parameter: %d)"),
-  N_("Shared memory: %-.100s"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("(unused error message)"),
-  N_("Wrong or unknown protocol"),
-  N_("Invalid connection handle"),
-  N_("Connection using old (pre-4.1.1) authentication protocol refused "
-     "(client option 'secure_auth' enabled)"),
-  N_("Row retrieval was canceled by drizzle_stmt_close() call"),
-  N_("Attempt to read column without prior row fetch"),
-  N_("Prepared statement contains no metadata"),
-  N_("Attempt to read a row while there is no result set associated with "
-     "the statement"),
-  N_("This feature is not implemented yet"),
-  N_("Lost connection to Drizzle server while waiting for initial "
-     "communication packet, system error: %d"),
-  N_("Lost connection to Drizzle server while reading initial communication "
-     "packet, system error: %d"),
-  N_("Lost connection to Drizzle server while sending authentication "
-     "information, system error: %d"),
-  N_("Lost connection to Drizzle server while reading authorization "
-     "information, system error: %d"),
-  N_("Lost connection to Drizzle server while setting initial database, "
-     "system error: %d"),
-  N_("Statement closed indirectly because of a preceding %s() call"),
-/* CR_NET_UNCOMPRESS_ERROR 08S01  */
-  N_("Couldn't uncompress communication packet"),
-/* CR_NET_READ_ERROR 08S01  */
-  N_("Got an error reading communication packets"),
-/* CR_NET_READ_INTERRUPTED 08S01  */
-  N_("Got timeout reading communication packets"),
-/* CR_NET_ERROR_ON_WRITE 08S01  */
-  N_("Got an error writing communication packets"),
-/* CR_NET_WRITE_INTERRUPTED 08S01  */
-  N_("Got timeout writing communication packets"),
-  ""
-};
-
-
-const char *
-drizzleclient_get_client_error(unsigned int err_index)
-{
-  return _(client_errors[err_index]);
-} 
-
 } /* namespace drizzle_protocol */

=== modified file 'plugin/drizzle_protocol/errmsg.h'
--- plugin/drizzle_protocol/errmsg.h	2010-03-04 18:06:27 +0000
+++ plugin/drizzle_protocol/errmsg.h	2010-10-06 01:14:00 +0000
@@ -23,86 +23,6 @@
 namespace drizzle_protocol
 {
 
-/* Error messages for MySQL clients */
-/* (Error messages for the daemon are in sql/share/errmsg.txt) */
-
-const char * drizzleclient_get_client_error(unsigned int err_index);
-
-#define CR_MIN_ERROR    2000  /* For easier client code */
-#define CR_MAX_ERROR    2999
-#if !defined(ER)
-#define ER(X) drizzleclient_get_client_error((X)-CR_MIN_ERROR)
-#endif
-#define CLIENT_ERRMAP    2  /* Errormap used by my_error() */
-
-/* Do not add error numbers before CR_ERROR_FIRST. */
-/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */
-enum CR_CLIENT_ERRORS {
-  CR_ERROR_FIRST    =2000, /*Copy first error nr.*/
-  CR_UNKNOWN_ERROR  =2000,
-  CR_SOCKET_CREATE_ERROR  =2001,
-  CR_CONNECTION_ERROR  =2002,
-  CR_CONN_HOST_ERROR  =2003,
-  CR_IPSOCK_ERROR    =2004,
-  CR_UNKNOWN_HOST    =2005,
-  CR_SERVER_GONE_ERROR  =2006,
-  CR_VERSION_ERROR  =2007,
-  CR_OUT_OF_MEMORY  =2008,
-  CR_WRONG_HOST_INFO  =2009,
-  CR_LOCALHOST_CONNECTION =2010,
-  CR_TCP_CONNECTION  =2011,
-  CR_SERVER_HANDSHAKE_ERR =2012,
-  CR_SERVER_LOST    =2013,
-  CR_COMMANDS_OUT_OF_SYNC =2014,
-  CR_NAMEDPIPE_CONNECTION =2015,
-  CR_NAMEDPIPEWAIT_ERROR  =2016,
-  CR_NAMEDPIPEOPEN_ERROR  =2017,
-  CR_NAMEDPIPESETSTATE_ERROR =2018,
-  CR_CANT_READ_CHARSET  =2019,
-  CR_NET_PACKET_TOO_LARGE =2020,
-  CR_EMBEDDED_CONNECTION  =2021,
-  CR_PROBE_SLAVE_STATUS   =2022,
-  CR_PROBE_SLAVE_HOSTS    =2023,
-  CR_PROBE_SLAVE_CONNECT  =2024,
-  CR_PROBE_MASTER_CONNECT =2025,
-  CR_SSL_CONNECTION_ERROR =2026,
-  CR_MALFORMED_PACKET     =2027,
-
-  CR_NULL_POINTER    =2029,
-  CR_NO_PREPARE_STMT  =2030,
-  CR_PARAMS_NOT_BOUND  =2031,
-  CR_DATA_TRUNCATED  =2032,
-  CR_NO_PARAMETERS_EXISTS =2033,
-  CR_INVALID_PARAMETER_NO =2034,
-  CR_INVALID_BUFFER_USE  =2035,
-  CR_UNSUPPORTED_PARAM_TYPE =2036,
-
-  CR_CONN_UNKNOW_PROTOCOL     =2047,
-  CR_INVALID_CONN_HANDLE      =2048,
-  CR_SECURE_AUTH                          =2049,
-  CR_FETCH_CANCELED                       =2050,
-  CR_NO_DATA                              =2051,
-  CR_NO_STMT_METADATA                     =2052,
-  CR_NO_RESULT_SET                        =2053,
-  CR_NOT_IMPLEMENTED                      =2054,
-  CR_SERVER_LOST_INITIAL_COMM_WAIT  =2055,
-  CR_SERVER_LOST_INITIAL_COMM_READ  =2056,
-  CR_SERVER_LOST_SEND_AUTH    =2057,
-  CR_SERVER_LOST_READ_AUTH    =2058,
-  CR_SERVER_LOST_SETTING_DB    =2059,
-
-  CR_STMT_CLOSED  =2060,
-
-  CR_NET_UNCOMPRESS_ERROR= 2061,
-  CR_NET_READ_ERROR= 2062,
-  CR_NET_READ_INTERRUPTED= 2063,
-  CR_NET_ERROR_ON_WRITE= 2064,
-  CR_NET_WRITE_INTERRUPTED= 2065,
-
-  /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
-  CR_ERROR_LAST    =2065 /*Copy last error nr:*/
-};
-
 } /* namespace drizzle_protocol */
 
 #endif /* PLUGIN_DRIZZLE_PROTOCOL_ERRMSG_H */

=== removed file 'plugin/drizzle_protocol/net_serv.cc'
--- plugin/drizzle_protocol/net_serv.cc	2010-05-19 01:22:29 +0000
+++ plugin/drizzle_protocol/net_serv.cc	1970-01-01 00:00:00 +0000
@@ -1,896 +0,0 @@
-/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems, Inc.
- *
- *  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
- */
-
-#include "config.h"
-#include <drizzled/session.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
-#include <zlib.h>
-#include <algorithm>
-
-#include "errmsg.h"
-#include "vio.h"
-#include "net_serv.h"
-
-using namespace std;
-
-namespace drizzle_protocol
-{
-
-/*
-  The following handles the differences when this is linked between the
-  client and the server.
-
-  This gives an error if a too big packet is found
-  The server can change this with the -O switch, but because the client
-  can't normally do this the client should have a bigger max_allowed_packet.
-*/
-
-  /* Constants when using compression */
-#define NET_HEADER_SIZE 4		/* standard header size */
-#define COMP_HEADER_SIZE 3		/* compression header extra size */
-
-#define MAX_PACKET_LENGTH (256L*256L*256L-1)
-const char  *not_error_sqlstate= "00000";
-
-static bool net_write_buff(NET *net, const unsigned char *packet, uint32_t len);
-static int drizzleclient_net_real_write(NET *net, const unsigned char *packet, size_t len);
-
-/** Init with packet info. */
-
-bool drizzleclient_net_init(NET *net, Vio* vio, uint32_t buffer_length)
-{
-  net->vio = vio;
-  net->max_packet= (uint32_t) buffer_length;
-  net->max_packet_size= max(buffer_length,
-                            drizzled::global_system_variables.max_allowed_packet);
-
-  if (!(net->buff=(unsigned char*) malloc((size_t) net->max_packet+
-                                          NET_HEADER_SIZE + COMP_HEADER_SIZE)))
-    return(1);
-  net->buff_end=net->buff+net->max_packet;
-  net->error=0; net->return_status=0;
-  net->pkt_nr=net->compress_pkt_nr=0;
-  net->write_pos=net->read_pos = net->buff;
-  net->last_error[0]=0;
-  net->compress=0; net->reading_or_writing=0;
-  net->where_b = net->remain_in_buf=0;
-  net->last_errno=0;
-  net->unused= 0;
-
-  if (vio != 0)                    /* If real connection */
-  {
-    net->fd  = drizzleclient_vio_fd(vio);            /* For perl DBI/DBD */
-    drizzleclient_vio_fastsend(vio);
-  }
-  return(0);
-}
-
-bool drizzleclient_net_init_sock(NET * net, int sock, int flags,
-                                 uint32_t buffer_length)
-{
-
-  Vio *drizzleclient_vio_tmp= drizzleclient_vio_new(sock, VIO_TYPE_TCPIP, flags);
-  if (drizzleclient_vio_tmp == NULL)
-    return true;
-  else
-    if (drizzleclient_net_init(net, drizzleclient_vio_tmp, buffer_length))
-    {
-      /* Only delete the temporary vio if we didn't already attach it to the
-       * NET object.
-       */
-      if (drizzleclient_vio_tmp && (net->vio != drizzleclient_vio_tmp))
-        drizzleclient_vio_delete(drizzleclient_vio_tmp);
-      else
-      {
-        (void) shutdown(sock, SHUT_RDWR);
-        (void) close(sock);
-      }
-      return true;
-    }
-  return false;
-}
-
-void drizzleclient_net_end(NET *net)
-{
-  if (net->buff != NULL)
-    free(net->buff);
-  net->buff= NULL;
-  return;
-}
-
-void drizzleclient_net_close(NET *net)
-{
-  if (net->vio != NULL)
-  {
-    drizzleclient_vio_delete(net->vio);
-    net->vio= 0;
-  }
-}
-
-bool drizzleclient_net_peer_addr(NET *net, char *buf, uint16_t *port, size_t buflen)
-{
-  return drizzleclient_vio_peer_addr(net->vio, buf, port, buflen);
-}
-
-void drizzleclient_net_keepalive(NET *net, bool flag)
-{
-  drizzleclient_vio_keepalive(net->vio, flag);
-}
-
-int drizzleclient_net_get_sd(NET *net)
-{
-  return net->vio->sd;
-}
-
-bool drizzleclient_net_more_data(NET *net)
-{
-  return (net->vio == 0 || net->vio->read_pos < net->vio->read_end);
-}
-
-/** Realloc the packet buffer. */
-
-static bool drizzleclient_net_realloc(NET *net, size_t length)
-{
-  unsigned char *buff;
-  size_t pkt_length;
-
-  if (length >= net->max_packet_size)
-  {
-    /* @todo: 1 and 2 codes are identical. */
-    net->error= 1;
-    net->last_errno= CR_NET_PACKET_TOO_LARGE;
-    return(1);
-  }
-  pkt_length = (length+IO_SIZE-1) & ~(IO_SIZE-1);
-  /*
-    We must allocate some extra bytes for the end 0 and to be able to
-    read big compressed blocks
-  */
-  if (!(buff= (unsigned char*) realloc((char*) net->buff, pkt_length +
-                               NET_HEADER_SIZE + COMP_HEADER_SIZE)))
-  {
-    /* @todo: 1 and 2 codes are identical. */
-    net->error= 1;
-    net->last_errno= CR_OUT_OF_MEMORY;
-    /* In the server the error is reported by MY_WME flag. */
-    return(1);
-  }
-  net->buff=net->write_pos=buff;
-  net->buff_end=buff+(net->max_packet= (uint32_t) pkt_length);
-  return(0);
-}
-
-
-/**
-   Check if there is any data to be read from the socket.
-
-   @param sd   socket descriptor
-
-   @retval
-   0  No data to read
-   @retval
-   1  Data or EOF to read
-   @retval
-   -1   Don't know if data is ready or not
-*/
-
-static bool net_data_is_ready(int sd)
-{
-  struct pollfd ufds;
-  int res;
-
-  ufds.fd= sd;
-  ufds.events= POLLIN | POLLPRI;
-  if (!(res= poll(&ufds, 1, 0)))
-    return 0;
-  if (res < 0 || !(ufds.revents & (POLLIN | POLLPRI)))
-    return 0;
-  return 1;
-}
-
-/**
-   Remove unwanted characters from connection
-   and check if disconnected.
-
-   Read from socket until there is nothing more to read. Discard
-   what is read.
-
-   If there is anything when to read 'drizzleclient_net_clear' is called this
-   normally indicates an error in the protocol.
-
-   When connection is properly closed (for TCP it means with
-   a FIN packet), then select() considers a socket "ready to read",
-   in the sense that there's EOF to read, but read() returns 0.
-
-   @param net            NET handler
-   @param clear_buffer           if <> 0, then clear all data from comm buff
-*/
-
-void drizzleclient_net_clear(NET *net, bool clear_buffer)
-{
-  if (clear_buffer)
-  {
-    while (net_data_is_ready(net->vio->sd) > 0)
-    {
-      /* The socket is ready */
-      if (drizzleclient_vio_read(net->vio, net->buff,
-                   (size_t) net->max_packet) <= 0)
-      {
-        net->error= 2;
-        break;
-      }
-    }
-  }
-  net->pkt_nr=net->compress_pkt_nr=0;        /* Ready for new command */
-  net->write_pos=net->buff;
-  return;
-}
-
-
-/** Flush write_buffer if not empty. */
-
-bool drizzleclient_net_flush(NET *net)
-{
-  bool error= 0;
-  if (net->buff != net->write_pos)
-  {
-    error=drizzleclient_net_real_write(net, net->buff,
-                         (size_t) (net->write_pos - net->buff)) ? 1 : 0;
-    net->write_pos=net->buff;
-  }
-  /* Sync packet number if using compression */
-  if (net->compress)
-    net->pkt_nr=net->compress_pkt_nr;
-  return(error);
-}
-
-
-/*****************************************************************************
- ** Write something to server/client buffer
- *****************************************************************************/
-
-/**
-   Write a logical packet with packet header.
-
-   Format: Packet length (3 bytes), packet number(1 byte)
-   When compression is used a 3 byte compression length is added
-
-   @note
-   If compression is used the original package is modified!
-*/
-
-bool
-drizzleclient_net_write(NET *net,const unsigned char *packet,size_t len)
-{
-  unsigned char buff[NET_HEADER_SIZE];
-  if (unlikely(!net->vio)) /* nowhere to write */
-    return 0;
-  /*
-    Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH
-    length. The last packet is always a packet that is < MAX_PACKET_LENGTH.
-    (The last packet may even have a length of 0)
-  */
-  while (len >= MAX_PACKET_LENGTH)
-  {
-    const uint32_t z_size = MAX_PACKET_LENGTH;
-    int3store(buff, z_size);
-    buff[3]= (unsigned char) net->pkt_nr++;
-    if (net_write_buff(net, buff, NET_HEADER_SIZE) ||
-        net_write_buff(net, packet, z_size))
-      return 1;
-    packet += z_size;
-    len-=     z_size;
-  }
-  /* Write last packet */
-  int3store(buff,len);
-  buff[3]= (unsigned char) net->pkt_nr++;
-  if (net_write_buff(net, buff, NET_HEADER_SIZE))
-    return 1;
-  return net_write_buff(net,packet,len) ? 1 : 0;
-}
-
-/**
-   Send a command to the server.
-
-   The reason for having both header and packet is so that libdrizzle
-   can easy add a header to a special command (like prepared statements)
-   without having to re-alloc the string.
-
-   As the command is part of the first data packet, we have to do some data
-   juggling to put the command in there, without having to create a new
-   packet.
-
-   This function will split big packets into sub-packets if needed.
-   (Each sub packet can only be 2^24 bytes)
-
-   @param net        NET handler
-   @param command    Command in MySQL server (enum enum_server_command)
-   @param header    Header to write after command
-   @param head_len    Length of header
-   @param packet    Query or parameter to query
-   @param len        Length of packet
-
-   @retval
-   0    ok
-   @retval
-   1    error
-*/
-
-bool
-drizzleclient_net_write_command(NET *net,unsigned char command,
-                  const unsigned char *header, size_t head_len,
-                  const unsigned char *packet, size_t len)
-{
-  uint32_t length=len+1+head_len;            /* 1 extra byte for command */
-  unsigned char buff[NET_HEADER_SIZE+1];
-  uint32_t header_size=NET_HEADER_SIZE+1;
-
-  buff[4]=command;                /* For first packet */
-
-  if (length >= MAX_PACKET_LENGTH)
-  {
-    /* Take into account that we have the command in the first header */
-    len= MAX_PACKET_LENGTH - 1 - head_len;
-    do
-    {
-      int3store(buff, MAX_PACKET_LENGTH);
-      buff[3]= (unsigned char) net->pkt_nr++;
-      if (net_write_buff(net, buff, header_size) ||
-          net_write_buff(net, header, head_len) ||
-          net_write_buff(net, packet, len))
-        return(1);
-      packet+= len;
-      length-= MAX_PACKET_LENGTH;
-      len= MAX_PACKET_LENGTH;
-      head_len= 0;
-      header_size= NET_HEADER_SIZE;
-    } while (length >= MAX_PACKET_LENGTH);
-    len=length;                    /* Data left to be written */
-  }
-  int3store(buff,length);
-  buff[3]= (unsigned char) net->pkt_nr++;
-  return((net_write_buff(net, buff, header_size) ||
-          (head_len && net_write_buff(net, header, head_len)) ||
-          net_write_buff(net, packet, len) || drizzleclient_net_flush(net)) ? 1 : 0 );
-}
-
-/**
-   Caching the data in a local buffer before sending it.
-
-   Fill up net->buffer and send it to the client when full.
-
-   If the rest of the to-be-sent-packet is bigger than buffer,
-   send it in one big block (to avoid copying to internal buffer).
-   If not, copy the rest of the data to the buffer and return without
-   sending data.
-
-   @param net        Network handler
-   @param packet    Packet to send
-   @param len        Length of packet
-
-   @note
-   The cached buffer can be sent as it is with 'drizzleclient_net_flush()'.
-   In this code we have to be careful to not send a packet longer than
-   MAX_PACKET_LENGTH to drizzleclient_net_real_write() if we are using the compressed
-   protocol as we store the length of the compressed packet in 3 bytes.
-
-   @retval
-   0    ok
-   @retval
-   1
-*/
-
-static bool
-net_write_buff(NET *net, const unsigned char *packet, uint32_t len)
-{
-  uint32_t left_length;
-  if (net->compress && net->max_packet > MAX_PACKET_LENGTH)
-    left_length= MAX_PACKET_LENGTH - (net->write_pos - net->buff);
-  else
-    left_length= (uint32_t) (net->buff_end - net->write_pos);
-
-  if (len > left_length)
-  {
-    if (net->write_pos != net->buff)
-    {
-      /* Fill up already used packet and write it */
-      memcpy(net->write_pos,packet,left_length);
-      if (drizzleclient_net_real_write(net, net->buff,
-                         (size_t) (net->write_pos - net->buff) + left_length))
-        return 1;
-      net->write_pos= net->buff;
-      packet+= left_length;
-      len-= left_length;
-    }
-    if (net->compress)
-    {
-      /*
-        We can't have bigger packets than 16M with compression
-        Because the uncompressed length is stored in 3 bytes
-      */
-      left_length= MAX_PACKET_LENGTH;
-      while (len > left_length)
-      {
-        if (drizzleclient_net_real_write(net, packet, left_length))
-          return 1;
-        packet+= left_length;
-        len-= left_length;
-      }
-    }
-    if (len > net->max_packet)
-      return drizzleclient_net_real_write(net, packet, len) ? 1 : 0;
-    /* Send out rest of the blocks as full sized blocks */
-  }
-  memcpy(net->write_pos,packet,len);
-  net->write_pos+= len;
-  return 0;
-}
-
-
-/**
-   Read and write one packet using timeouts.
-   If needed, the packet is compressed before sending.
-
-   @todo
-   - TODO is it needed to set this variable if we have no socket
-*/
-
-/*
-  TODO: rewrite this in a manner to do non-block writes. If a write can not be made, and we are
-  in the server, yield to another process and come back later.
-*/
-static int
-drizzleclient_net_real_write(NET *net, const unsigned char *packet, size_t len)
-{
-  size_t length;
-  const unsigned char *pos, *end;
-  uint32_t retry_count= 0;
-
-  /* Backup of the original SO_RCVTIMEO timeout */
-
-  if (net->error == 2)
-    return(-1);                /* socket can't be used */
-
-  net->reading_or_writing=2;
-  if (net->compress)
-  {
-    size_t complen;
-    unsigned char *b;
-    const uint32_t header_length=NET_HEADER_SIZE+COMP_HEADER_SIZE;
-    if (!(b= (unsigned char*) malloc(len + NET_HEADER_SIZE +
-                             COMP_HEADER_SIZE)))
-    {
-      net->error= 2;
-      net->last_errno= CR_OUT_OF_MEMORY;
-      /* In the server, the error is reported by MY_WME flag. */
-      net->reading_or_writing= 0;
-      return(1);
-    }
-    memcpy(b+header_length,packet,len);
-
-    complen= len * 120 / 100 + 12;
-    unsigned char * compbuf= (unsigned char *) malloc(complen);
-    if (compbuf != NULL)
-    {
-      uLongf tmp_complen= complen;
-      int res= compress((Bytef*) compbuf, &tmp_complen,
-                        (Bytef*) (b+header_length),
-                        len);
-      complen= tmp_complen;
-
-      free(compbuf);
-
-      if ((res != Z_OK) || (complen >= len))
-        complen= 0;
-      else
-      {
-        size_t tmplen= complen;
-        complen= len;
-        len= tmplen;
-      }
-    }
-    else
-    {
-      complen=0;
-    }
-    int3store(&b[NET_HEADER_SIZE],complen);
-    int3store(b,len);
-    b[3]=(unsigned char) (net->compress_pkt_nr++);
-    len+= header_length;
-    packet= b;
-  }
-
-  pos= packet;
-  end=pos+len;
-  /* Loop until we have read everything */
-  while (pos != end)
-  {
-    assert(pos);
-    if ((long) (length= drizzleclient_vio_write(net->vio, pos, (size_t) (end-pos))) <= 0)
-    {
-     /*
-      * We could end up here with net->vio == NULL
-      * See LP bug#436685
-      * If that is the case, we exit the while loop
-      */
-      if (net->vio == NULL)
-        break;
-      
-      const bool interrupted= drizzleclient_vio_should_retry(net->vio);
-      /*
-        If we read 0, or we were interrupted this means that
-        we need to switch to blocking mode and wait until the timeout
-        on the socket kicks in.
-      */
-      if ((interrupted || length == 0))
-      {
-        bool old_mode;
-
-        while (drizzleclient_vio_blocking(net->vio, true, &old_mode) < 0)
-        {
-          if (drizzleclient_vio_should_retry(net->vio) && retry_count++ < net->retry_count)
-            continue;
-          net->error= 2;                     /* Close socket */
-          net->last_errno= CR_NET_PACKET_TOO_LARGE;
-          goto end;
-        }
-        retry_count=0;
-        continue;
-      }
-      else
-      {
-        if (retry_count++ < net->retry_count)
-          continue;
-      }
-
-      if (drizzleclient_vio_errno(net->vio) == EINTR)
-      {
-        continue;
-      }
-      net->error= 2;                /* Close socket */
-      net->last_errno= (interrupted ? CR_NET_WRITE_INTERRUPTED :
-                        CR_NET_ERROR_ON_WRITE);
-      break;
-    }
-    pos+=length;
-    current_session->status_var.bytes_sent+= length;
-  }
-end:
-  if ((net->compress) && (packet != NULL))
-    free((char*) packet);
-  net->reading_or_writing=0;
-
-  return(((int) (pos != end)));
-}
-
-
-/**
-   Reads one packet to net->buff + net->where_b.
-   Long packets are handled by drizzleclient_net_read().
-   This function reallocates the net->buff buffer if necessary.
-
-   @return
-   Returns length of packet.
-*/
-
-static uint32_t
-my_real_read(NET *net, size_t *complen)
-{
-  unsigned char *pos;
-  size_t length;
-  uint32_t i,retry_count=0;
-  size_t len=packet_error;
-  uint32_t remain= (net->compress ? NET_HEADER_SIZE+COMP_HEADER_SIZE :
-                    NET_HEADER_SIZE);
-
-  *complen = 0;
-
-  net->reading_or_writing= 1;
-  /* Read timeout is set in drizzleclient_net_set_read_timeout */
-
-  pos = net->buff + net->where_b;        /* net->packet -4 */
-
-  for (i= 0; i < 2 ; i++)
-  {
-    while (remain > 0)
-    {
-      /* First read is done with non blocking mode */
-      if ((long) (length= drizzleclient_vio_read(net->vio, pos, remain)) <= 0L)
-      {
-        if (net->vio == NULL)
-          goto end;
-
-        const bool interrupted = drizzleclient_vio_should_retry(net->vio);
-
-        if (interrupted)
-        {                    /* Probably in MIT threads */
-          if (retry_count++ < net->retry_count)
-            continue;
-        }
-        if (drizzleclient_vio_errno(net->vio) == EINTR)
-        {
-          continue;
-        }
-        len= packet_error;
-        net->error= 2;                /* Close socket */
-        net->last_errno= (drizzleclient_vio_was_interrupted(net->vio) ?
-                          CR_NET_READ_INTERRUPTED :
-                          CR_NET_READ_ERROR);
-        ER(net->last_errno);
-        goto end;
-      }
-      remain -= (uint32_t) length;
-      pos+= length;
-      current_session->status_var.bytes_received+= length;
-    }
-    if (i == 0)
-    {                    /* First parts is packet length */
-      uint32_t helping;
-
-      if (net->buff[net->where_b + 3] != (unsigned char) net->pkt_nr)
-      {
-        len= packet_error;
-        /* Not a NET error on the client. XXX: why? */
-        goto end;
-      }
-      net->compress_pkt_nr= ++net->pkt_nr;
-      if (net->compress)
-      {
-        /*
-          If the packet is compressed then complen > 0 and contains the
-          number of bytes in the uncompressed packet
-        */
-        *complen=uint3korr(&(net->buff[net->where_b + NET_HEADER_SIZE]));
-      }
-
-      len=uint3korr(net->buff+net->where_b);
-      if (!len)                /* End of big multi-packet */
-        goto end;
-      helping = max(len,*complen) + net->where_b;
-      /* The necessary size of net->buff */
-      if (helping >= net->max_packet)
-      {
-        if (drizzleclient_net_realloc(net,helping))
-        {
-          len= packet_error;          /* Return error and close connection */
-          goto end;
-        }
-      }
-      pos=net->buff + net->where_b;
-      remain = (uint32_t) len;
-    }
-  }
-
-end:
-  net->reading_or_writing= 0;
-
-  return(len);
-}
-
-
-/**
-   Read a packet from the client/server and return it without the internal
-   package header.
-
-   If the packet is the first packet of a multi-packet packet
-   (which is indicated by the length of the packet = 0xffffff) then
-   all sub packets are read and concatenated.
-
-   If the packet was compressed, its uncompressed and the length of the
-   uncompressed packet is returned.
-
-   @return
-   The function returns the length of the found packet or packet_error.
-   net->read_pos points to the read data.
-*/
-
-uint32_t
-drizzleclient_net_read(NET *net)
-{
-  size_t len, complen;
-
-  if (!net->compress)
-  {
-    len = my_real_read(net,&complen);
-    if (len == MAX_PACKET_LENGTH)
-    {
-      /* First packet of a multi-packet.  Concatenate the packets */
-      uint32_t save_pos = net->where_b;
-      size_t total_length= 0;
-      do
-      {
-        net->where_b += len;
-        total_length += len;
-        len = my_real_read(net,&complen);
-      } while (len == MAX_PACKET_LENGTH);
-      if (len != packet_error)
-        len+= total_length;
-      net->where_b = save_pos;
-    }
-    net->read_pos = net->buff + net->where_b;
-    if (len != packet_error)
-      net->read_pos[len]=0;        /* Safeguard for drizzleclient_use_result */
-    return len;
-  }
-  else
-  {
-    /* We are using the compressed protocol */
-
-    uint32_t buf_length;
-    uint32_t start_of_packet;
-    uint32_t first_packet_offset;
-    uint32_t read_length, multi_byte_packet=0;
-
-    if (net->remain_in_buf)
-    {
-      buf_length= net->buf_length;        /* Data left in old packet */
-      first_packet_offset= start_of_packet= (net->buf_length -
-                                             net->remain_in_buf);
-      /* Restore the character that was overwritten by the end 0 */
-      net->buff[start_of_packet]= net->save_char;
-    }
-    else
-    {
-      /* reuse buffer, as there is nothing in it that we need */
-      buf_length= start_of_packet= first_packet_offset= 0;
-    }
-    for (;;)
-    {
-      uint32_t packet_len;
-
-      if (buf_length - start_of_packet >= NET_HEADER_SIZE)
-      {
-        read_length = uint3korr(net->buff+start_of_packet);
-        if (!read_length)
-        {
-          /* End of multi-byte packet */
-          start_of_packet += NET_HEADER_SIZE;
-          break;
-        }
-        if (read_length + NET_HEADER_SIZE <= buf_length - start_of_packet)
-        {
-          if (multi_byte_packet)
-          {
-            /* Remove packet header for second packet */
-            memmove(net->buff + first_packet_offset + start_of_packet,
-                    net->buff + first_packet_offset + start_of_packet +
-                    NET_HEADER_SIZE,
-                    buf_length - start_of_packet);
-            start_of_packet += read_length;
-            buf_length -= NET_HEADER_SIZE;
-          }
-          else
-            start_of_packet+= read_length + NET_HEADER_SIZE;
-
-          if (read_length != MAX_PACKET_LENGTH)    /* last package */
-          {
-            multi_byte_packet= 0;        /* No last zero len packet */
-            break;
-          }
-          multi_byte_packet= NET_HEADER_SIZE;
-          /* Move data down to read next data packet after current one */
-          if (first_packet_offset)
-          {
-            memmove(net->buff,net->buff+first_packet_offset,
-                    buf_length-first_packet_offset);
-            buf_length-=first_packet_offset;
-            start_of_packet -= first_packet_offset;
-            first_packet_offset=0;
-          }
-          continue;
-        }
-      }
-      /* Move data down to read next data packet after current one */
-      if (first_packet_offset)
-      {
-        memmove(net->buff,net->buff+first_packet_offset,
-                buf_length-first_packet_offset);
-        buf_length-=first_packet_offset;
-        start_of_packet -= first_packet_offset;
-        first_packet_offset=0;
-      }
-
-      net->where_b=buf_length;
-      if ((packet_len = my_real_read(net,&complen)) == packet_error)
-        return packet_error;
-
-      if (complen)
-      {
-        unsigned char * compbuf= (unsigned char *) malloc(complen);
-        if (compbuf != NULL)
-        {
-          uLongf tmp_complen= complen;
-          int error= uncompress((Bytef*) compbuf, &tmp_complen,
-                                (Bytef*) (net->buff + net->where_b),
-                                (uLong)packet_len);
-          complen= tmp_complen;
-
-          if (error != Z_OK)
-          {
-            net->error= 2;            /* caller will close socket */
-            net->last_errno= CR_NET_UNCOMPRESS_ERROR;
-          }
-          else
-          {
-            memcpy((net->buff + net->where_b), compbuf, complen);
-          }
-          free(compbuf);
-        }
-      }
-      else
-        complen= packet_len;
-
-    }
-    buf_length+= complen;
-
-    net->read_pos=      net->buff+ first_packet_offset + NET_HEADER_SIZE;
-    net->buf_length=    buf_length;
-    net->remain_in_buf= (uint32_t) (buf_length - start_of_packet);
-    len = ((uint32_t) (start_of_packet - first_packet_offset) - NET_HEADER_SIZE -
-           multi_byte_packet);
-    net->save_char= net->read_pos[len];    /* Must be saved */
-    net->read_pos[len]=0;        /* Safeguard for drizzleclient_use_result */
-  }
-  return len;
-  }
-
-
-void drizzleclient_net_set_read_timeout(NET *net, uint32_t timeout)
-{
-  net->read_timeout= timeout;
-#ifndef __sun
-  if (net->vio)
-    drizzleclient_vio_timeout(net->vio, 0, timeout);
-#endif
-  return;
-}
-
-
-void drizzleclient_net_set_write_timeout(NET *net, uint32_t timeout)
-{
-  net->write_timeout= timeout;
-#ifndef __sun
-  if (net->vio)
-    drizzleclient_vio_timeout(net->vio, 1, timeout);
-#endif
-  return;
-}
-/**
-  Clear possible error state of struct NET
-
-  @param net  clear the state of the argument
-*/
-
-void drizzleclient_drizzleclient_net_clear_error(NET *net)
-{
-  net->last_errno= 0;
-  net->last_error[0]= '\0';
-  strcpy(net->sqlstate, not_error_sqlstate);
-}
-
-} /* namespace drizzle_protocol */

=== removed file 'plugin/drizzle_protocol/net_serv.h'
--- plugin/drizzle_protocol/net_serv.h	2010-03-04 18:06:27 +0000
+++ plugin/drizzle_protocol/net_serv.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems, Inc.
- *
- *  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; version 2 of the License.
- *
- *  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_NET_SERV_H
-#define PLUGIN_DRIZZLE_PROTOCOL_NET_SERV_H
-
-#include "vio.h"
-
-#include <stdint.h>
-
-namespace drizzle_protocol
-{
-
-#define LIBDRIZZLE_ERRMSG_SIZE 512
-#define LIBDRIZZLE_SQLSTATE_LENGTH 5
-
-typedef struct st_net {
-  Vio *vio;
-  unsigned char *buff,*buff_end,*write_pos,*read_pos;
-  int fd;					/* For Perl DBI/dbd */
-  /*
-    The following variable is set if we are doing several queries in one
-    command ( as in LOAD TABLE ... FROM MASTER ),
-    and do not want to confuse the client with OK at the wrong time
-  */
-  unsigned long remain_in_buf,length, buf_length, where_b;
-  unsigned long max_packet,max_packet_size;
-  unsigned int pkt_nr,compress_pkt_nr;
-  unsigned int write_timeout;
-  unsigned int read_timeout;
-  unsigned int retry_count;
-  int fcntl;
-  unsigned int *return_status;
-  unsigned char reading_or_writing;
-  char save_char;
-  bool compress;
-  /*
-    Pointer to query object in query cache, do not equal NULL (0) for
-    queries in cache that have not stored its results yet
-  */
-  /*
-    Unused, please remove with the next incompatible ABI change.
-  */
-  unsigned char *unused;
-  unsigned int last_errno;
-  unsigned char error;
-  /** Client library error message buffer. Actually belongs to struct MYSQL. */
-  char last_error[LIBDRIZZLE_ERRMSG_SIZE];
-  /** Client library sqlstate buffer. Set along with the error message. */
-  char sqlstate[LIBDRIZZLE_SQLSTATE_LENGTH+1];
-  void *extension;
-} NET;
-
-bool drizzleclient_net_init(NET *net, Vio* vio, uint32_t buffer_length);
-void drizzleclient_net_end(NET *net);
-void drizzleclient_net_clear(NET *net, bool clear_buffer);
-bool drizzleclient_net_flush(NET *net);
-bool drizzleclient_net_write(NET *net,const unsigned char *packet, size_t len);
-bool drizzleclient_net_write_command(NET *net,unsigned char command,
-                                     const unsigned char *header, size_t head_len,
-                                     const unsigned char *packet, size_t len);
-uint32_t drizzleclient_net_read(NET *net);
-void drizzleclient_net_close(NET *net);
-bool drizzleclient_net_init_sock(NET * net, int sock, int flags,
-                                 uint32_t buffer_length);
-bool drizzleclient_net_peer_addr(NET *net, char *buf, uint16_t *port, size_t buflen);
-void drizzleclient_net_keepalive(NET *net, bool flag);
-int drizzleclient_net_get_sd(NET *net);
-bool drizzleclient_net_more_data(NET *net);
-
-void drizzleclient_net_set_write_timeout(NET *net, uint32_t timeout);
-void drizzleclient_net_set_read_timeout(NET *net, uint32_t timeout);
-void drizzleclient_drizzleclient_net_clear_error(NET *net);
-
-} /* namespace drizzle_protocol */
-
-#endif /* PLUGIN_DRIZZLE_PROTOCOL_NET_SERV_H */

=== removed file 'plugin/drizzle_protocol/options.h'
--- plugin/drizzle_protocol/options.h	2010-03-04 18:06:27 +0000
+++ plugin/drizzle_protocol/options.h	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems, Inc.
- *
- *  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; version 2 of the License.
- *
- *  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_OPTIONS_H
-#define PLUGIN_DRIZZLE_PROTOCOL_OPTIONS_H
-
-namespace drizzle_protocol
-{
-
-enum drizzle_option
-{
-  DRIZZLE_OPT_CONNECT_TIMEOUT, DRIZZLE_OPT_COMPRESS, DRIZZLE_OPT_NAMED_PIPE,
-  DRIZZLE_INIT_COMMAND, DRIZZLE_READ_DEFAULT_FILE, DRIZZLE_READ_DEFAULT_GROUP,
-  DRIZZLE_OPT_PROTOCOL, DRIZZLE_SHARED_MEMORY_BASE_NAME, DRIZZLE_OPT_READ_TIMEOUT,
-  DRIZZLE_OPT_WRITE_TIMEOUT, DRIZZLE_OPT_USE_RESULT,
-  DRIZZLE_OPT_USE_REMOTE_CONNECTION,
-  DRIZZLE_OPT_GUESS_CONNECTION, DRIZZLE_SET_CLIENT_IP, DRIZZLE_SECURE_AUTH,
-  DRIZZLE_REPORT_DATA_TRUNCATION, DRIZZLE_OPT_RECONNECT,
-  DRIZZLE_OPT_SSL_VERIFY_SERVER_CERT
-};
-
-struct st_drizzleclient_options {
-  unsigned int connect_timeout, read_timeout, write_timeout;
-  unsigned int port;
-  unsigned long client_flag;
-  char *host,*user,*password,*db;
-  char *my_cnf_file,*my_cnf_group;
-  char *ssl_key;        /* PEM key file */
-  char *ssl_cert;        /* PEM cert file */
-  char *ssl_ca;          /* PEM CA file */
-  char *ssl_capath;        /* PEM directory of CA-s? */
-  char *ssl_cipher;        /* cipher to use */
-  char *shared_memory_base_name;
-  unsigned long max_allowed_packet;
-  bool use_ssl;        /* if to use SSL or not */
-  bool compress,named_pipe;
-  bool unused1;
-  bool unused2;
-  bool unused3;
-  bool unused4;
-  enum drizzle_option methods_to_use;
-  char *client_ip;
-  /* Refuse client connecting to server if it uses old (pre-4.1.1) protocol */
-  bool secure_auth;
-  /* 0 - never report, 1 - always report (default) */
-  bool report_data_truncation;
-
-  /* function pointers for local infile support */
-  int (*local_infile_init)(void **, const char *, void *);
-  int (*local_infile_read)(void *, char *, unsigned int);
-  void (*local_infile_end)(void *);
-  int (*local_infile_error)(void *, char *, unsigned int);
-  void *local_infile_userdata;
-  void *extension;
-};
-
-
-#define CLIENT_NET_READ_TIMEOUT    365*24*3600  /* Timeout on read */
-#define CLIENT_NET_WRITE_TIMEOUT  365*24*3600  /* Timeout on write */
-
-#define CLIENT_LONG_PASSWORD    1       /* new more secure passwords */
-#define CLIENT_FOUND_ROWS       2       /* Found instead of affected rows */
-#define CLIENT_LONG_FLAG        4       /* Get all column flags */
-#define CLIENT_CONNECT_WITH_DB  8       /* One can specify db on connect */
-#define CLIENT_NO_SCHEMA        16      /* Don't allow database.table.column */
-#define CLIENT_COMPRESS         32      /* Can use compression protocol */
-#define CLIENT_ODBC             64      /* Odbc client */
-#define CLIENT_IGNORE_SPACE     256     /* Ignore spaces before '(' */
-#define CLIENT_PROTOCOL_MYSQL41 512     /* New 4.1 protocol */
-#define CLIENT_SSL              2048    /* Switch to SSL after handshake */
-#define CLIENT_IGNORE_SIGPIPE   4096    /* IGNORE sigpipes */
-#define CLIENT_RESERVED         16384   /* Old flag for 4.1 protocol  */
-#define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
-#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */
-#define CLIENT_MULTI_RESULTS    (1UL << 17) /* Enable/disable multi-results */
-
-#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
-#define CLIENT_REMEMBER_OPTIONS (1UL << 31)
-
-/* Gather all possible capabilites (flags) supported by the server */
-#define CLIENT_ALL_FLAGS  (CLIENT_LONG_PASSWORD | \
-                           CLIENT_FOUND_ROWS | \
-                           CLIENT_LONG_FLAG | \
-                           CLIENT_CONNECT_WITH_DB | \
-                           CLIENT_NO_SCHEMA | \
-                           CLIENT_COMPRESS | \
-                           CLIENT_ODBC | \
-                           CLIENT_IGNORE_SPACE | \
-                           CLIENT_SSL | \
-                           CLIENT_IGNORE_SIGPIPE | \
-                           CLIENT_RESERVED | \
-                           CLIENT_SECURE_CONNECTION | \
-                           CLIENT_MULTI_STATEMENTS | \
-                           CLIENT_MULTI_RESULTS | \
-                           CLIENT_SSL_VERIFY_SERVER_CERT | \
-                           CLIENT_REMEMBER_OPTIONS)
-
-/*
-  Switch off the flags that are optional and depending on build flags
-  If any of the optional flags is supported by the build it will be switched
-  on before sending to the client during the connection handshake.
-*/
-#define CLIENT_BASIC_FLAGS (((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \
-                                               & ~CLIENT_COMPRESS) \
-                                               & ~CLIENT_SSL_VERIFY_SERVER_CERT)
-
-} /* namespace drizzle_protocol */
-
-#endif /* PLUGIN_DRIZZLE_PROTOCOL_OPTIONS_H */

=== removed file 'plugin/drizzle_protocol/pack.cc'
--- plugin/drizzle_protocol/pack.cc	2010-03-04 18:06:27 +0000
+++ plugin/drizzle_protocol/pack.cc	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems, Inc.
- *
- *  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; version 2 of the License.
- *
- *  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
- */
-
-#include "config.h"
-#include <drizzled/korr.h>
-
-#include <stdint.h>
-
-#include "pack.h"
-
-namespace drizzle_protocol
-{
-
-/* Get the length of next field. Change parameter to point at fieldstart */
-uint32_t drizzleclient_net_field_length(unsigned char **packet)
-{
-  register unsigned char *pos= (unsigned char *)*packet;
-  if (*pos < 251)
-  {
-    (*packet)++;
-    return (uint32_t) *pos;
-  }
-  if (*pos == 251)
-  {
-    (*packet)++;
-    return NULL_LENGTH;
-  }
-  if (*pos == 252)
-  {
-    (*packet)+=3;
-    return (uint32_t) uint2korr(pos+1);
-  }
-  if (*pos == 253)
-  {
-    (*packet)+=4;
-    return (uint32_t) uint3korr(pos+1);
-  }
-  (*packet)+=9;          /* Must be 254 when here */
-  return (uint32_t) uint4korr(pos+1);
-}
-
-/* The same as above but returns int64_t */
-uint64_t drizzleclient_drizzleclient_net_field_length_ll(unsigned char **packet)
-{
-  register unsigned char *pos= *packet;
-  if (*pos < 251)
-  {
-    (*packet)++;
-    return (uint64_t) *pos;
-  }
-  if (*pos == 251)
-  {
-    (*packet)++;
-    return (uint64_t) NULL_LENGTH;
-  }
-  if (*pos == 252)
-  {
-    (*packet)+=3;
-    return (uint64_t) uint2korr(pos+1);
-  }
-  if (*pos == 253)
-  {
-    (*packet)+=4;
-    return (uint64_t) uint3korr(pos+1);
-  }
-  (*packet)+=9;          /* Must be 254 when here */
-#ifdef NO_CLIENT_LONGLONG
-  return (uint64_t) uint4korr(pos+1);
-#else
-  return (uint64_t) uint8korr(pos+1);
-#endif
-}
-
-/*
-  Store an integer with simple packing into a output package
-
-  SYNOPSIS
-    drizzleclient_net_store_length()
-    pkg      Store the packed integer here
-    length    integers to store
-
-  NOTES
-    This is mostly used to store lengths of strings.
-    We have to cast the result for the LL() becasue of a bug in Forte CC
-    compiler.
-
-  RETURN
-   Position in 'pkg' after the packed length
-*/
-
-unsigned char *drizzleclient_net_store_length(unsigned char *packet, uint64_t length)
-{
-  if (length < (uint64_t) 251LL)
-  {
-    *packet=(unsigned char) length;
-    return packet+1;
-  }
-  /* 251 is reserved for NULL */
-  if (length < (uint64_t) 65536LL)
-  {
-    *packet++=252;
-    int2store(packet,(uint32_t) length);
-    return packet+2;
-  }
-  if (length < (uint64_t) 16777216LL)
-  {
-    *packet++=253;
-    int3store(packet,(uint32_t) length);
-    return packet+3;
-  }
-  *packet++=254;
-  int8store(packet,length);
-  return packet+8;
-}
-
-} /* namespace drizzle_protocol */

=== removed file 'plugin/drizzle_protocol/pack.h'
--- plugin/drizzle_protocol/pack.h	2010-03-04 18:06:27 +0000
+++ plugin/drizzle_protocol/pack.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  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; version 2 of the License.
- *
- *  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_PACK_H
-#define PLUGIN_DRIZZLE_PROTOCOL_PACK_H
-
-namespace drizzle_protocol
-{
-
-#define NULL_LENGTH UINT32_MAX
-
-uint32_t drizzleclient_net_field_length(unsigned char **packet);
-uint64_t drizzleclient_drizzleclient_net_field_length_ll(unsigned char **packet);
-unsigned char *drizzleclient_net_store_length(unsigned char *pkg, uint64_t length);
-
-} /* namespace drizzle_protocol */
-
-#endif /* PLUGIN_DRIZZLE_PROTOCOL_PACK_H */

=== modified file 'plugin/drizzle_protocol/plugin.ini'
--- plugin/drizzle_protocol/plugin.ini	2010-09-01 19:17:03 +0000
+++ plugin/drizzle_protocol/plugin.ini	2010-10-06 01:14:00 +0000
@@ -1,12 +1,17 @@
 [plugin]
 title=Drizzle Protocol Module
-description=Drizzle protocol module that uses the old libdrizzle library (previously libmysql).
-version=0.2
-author=Eric Day
+description=Drizzle protocol module.
+version=0.3
+author=Brian Aker
 license=PLUGIN_LICENSE_GPL
 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 table_function.h
-sources=drizzle_protocol.cc errmsg.cc net_serv.cc pack.cc vio.cc viosocket.cc
+headers=
+  drizzle_protocol.h
+  errmsg.h
+  status_table.h
+sources=
+  drizzle_protocol.cc
+  errmsg.h
 static=yes

=== renamed file 'plugin/drizzle_protocol/table_function.h' => 'plugin/drizzle_protocol/status_table.h'
--- plugin/drizzle_protocol/table_function.h	2010-09-08 22:20:35 +0000
+++ plugin/drizzle_protocol/status_table.h	2010-10-06 01:14:00 +0000
@@ -18,18 +18,18 @@
  *  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
+#ifndef PLUGIN_DRIZZLE_PROTOCOL_STATUS_TABLE_H
+#define PLUGIN_DRIZZLE_PROTOCOL_STATUS_TABLE_H
 
 #include "drizzled/plugin/table_function.h"
 namespace drizzle_protocol
 {
 
 
-class DrizzleProtocolStatus : public drizzled::plugin::TableFunction
+class StatusTable : public drizzled::plugin::TableFunction
 {
 public:
-  DrizzleProtocolStatus() :
+  StatusTable() :
     drizzled::plugin::TableFunction("DATA_DICTIONARY","DRIZZLE_PROTOCOL_STATUS")
   {
     add_field("VARIABLE_NAME");
@@ -38,12 +38,17 @@
 
   class Generator : public drizzled::plugin::TableFunction::Generator
   {
-    drizzled::drizzle_show_var *status_var_ptr;
 
   public:
-    Generator(drizzled::Field **fields);
+    Generator(drizzled::Field **fields) :
+      drizzled::plugin::TableFunction::Generator(fields)
+    {
+    }
 
-    bool populate();
+    bool populate()
+    {
+      return false;
+    }
   };
 
   Generator *generator(drizzled::Field **arg)
@@ -54,4 +59,4 @@
 
 }
 
-#endif /* PLUGIN_DRIZZLE_PROTOCOL_TABLE_FUNCTION_H */
+#endif /* PLUGIN_DRIZZLE_PROTOCOL_STATUS_TABLE_H */

=== renamed file 'plugin/drizzle_protocol/vio.cc' => 'plugin/drizzle_protocol/vio.cc.THIS'
=== renamed file 'plugin/drizzle_protocol/vio.h' => 'plugin/drizzle_protocol/vio.h.THIS'
=== renamed file 'plugin/drizzle_protocol/viosocket.cc' => 'plugin/drizzle_protocol/viosocket.cc.THIS'
=== modified file 'plugin/information_schema_dictionary/key_column_usage.cc'
--- plugin/information_schema_dictionary/key_column_usage.cc	2010-07-11 15:57:03 +0000
+++ plugin/information_schema_dictionary/key_column_usage.cc	2010-10-06 01:14:00 +0000
@@ -41,7 +41,9 @@
   InformationSchema::Generator(arg),
   generator(getSession()),
   index_iterator(0),
-  index_part_iterator(0)
+  index_part_iterator(0),
+  fk_constraint_iterator(0),
+  fk_constraint_column_name_iterator(0)
 {
   while (not (table_message= generator))
   { };
@@ -84,7 +86,7 @@
         push(table_message->field(fieldnr).name());
 
         /* ORDINAL_POSITION */
-        push(static_cast<int64_t>(index_part_iterator));
+        push(static_cast<int64_t>((index_part_iterator +1)));
 
         if (index_part_iterator == index.index_part_size() -1)
         {
@@ -100,9 +102,56 @@
       }
     }
 
+    if (fk_constraint_iterator != table_message->fk_constraint_size())
+    {
+      drizzled::message::Table::ForeignKeyConstraint foreign_key= table_message->fk_constraint(fk_constraint_iterator);
+
+      {
+        /* Constraints live in the same catalog.schema as the table they refer too. */
+        /* CONSTRAINT_CATALOG */
+        push(table_message->catalog());
+
+        /* CONSTRAINT_SCHEMA */
+        push(table_message->schema());
+
+        /* CONSTRAINT_NAME */
+        push(foreign_key.name());
+
+        /* TABLE_CATALOG */
+        push(table_message->catalog());
+
+        /* TABLE_SCHEMA */
+        push(table_message->schema());
+
+        /* TABLE_NAME */
+        push(table_message->name());
+
+        /* COLUMN_NAME */
+        push(foreign_key.column_names(fk_constraint_column_name_iterator));
+
+        /* ORDINAL_POSITION */
+        push(static_cast<int64_t>((fk_constraint_column_name_iterator + 1)));
+
+        if (fk_constraint_column_name_iterator == foreign_key.column_names_size() -1)
+        {
+          fk_constraint_iterator++;
+          fk_constraint_column_name_iterator= 0;
+        }
+        else
+        {
+          fk_constraint_column_name_iterator++;
+        }
+
+        return true;
+      }
+    }
+
     index_iterator= 0;
     index_part_iterator= 0;
 
+    fk_constraint_iterator= 0;
+    fk_constraint_column_name_iterator= 0;
+
   } while ((table_message= generator));
 
   return false;

=== modified file 'plugin/information_schema_dictionary/key_column_usage.h'
--- plugin/information_schema_dictionary/key_column_usage.h	2010-07-09 21:52:18 +0000
+++ plugin/information_schema_dictionary/key_column_usage.h	2010-10-06 01:14:00 +0000
@@ -34,6 +34,9 @@
     int32_t index_iterator;
     int32_t index_part_iterator;
 
+    int32_t fk_constraint_iterator;
+    int32_t fk_constraint_column_name_iterator;
+
   public:
     Generator(drizzled::Field **arg);
 

=== modified file 'plugin/information_schema_dictionary/tests/r/key_column_usage.result'
--- plugin/information_schema_dictionary/tests/r/key_column_usage.result	2010-07-09 21:52:18 +0000
+++ plugin/information_schema_dictionary/tests/r/key_column_usage.result	2010-10-06 01:14:00 +0000
@@ -336,40 +336,40 @@
 ) ;
 select * from information_schema.key_column_usage WHERE table_schema="everything" ORDER BY TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION
-	everything	PRIMARY		everything	branch	branch_id	0
-	everything	PRIMARY		everything	container	container_id	0
-	everything	PRIMARY		everything	document	document_id	0
-	everything	PRIMARY		everything	genstats_attributes	genstats_attributes_id	0
-	everything	PRIMARY		everything	htmlcode	htmlcode_id	0
-	everything	PRIMARY		everything	htmlpage	htmlpage_id	0
-	everything	PRIMARY		everything	image	image_id	0
-	everything	PRIMARY		everything	javascript	javascript_id	0
-	everything	PRIMARY		everything	knowledge_item	knowledge_item_id	0
-	everything	PRIMARY		everything	links	from_node	0
-	everything	PRIMARY		everything	links	linktype	2
-	everything	PRIMARY		everything	links	to_node	1
-	everything	PRIMARY		everything	mail	mail_id	0
-	everything	PRIMARY		everything	node	node_id	0
-	everything	PRIMARY		everything	nodegroup	nodegroup_id	0
-	everything	PRIMARY		everything	nodegroup	rank	1
-	everything	PRIMARY		everything	nodelet	nodelet_id	0
-	everything	PRIMARY		everything	nodemethod	nodemethod_id	0
-	everything	PRIMARY		everything	nodetype	nodetype_id	0
-	everything	PRIMARY		everything	project	project_id	0
-	everything	PRIMARY		everything	project_document	project_document_id	0
-	everything	PRIMARY		everything	question	question_id	0
-	everything	PRIMARY		everything	question	rank	1
-	everything	PRIMARY		everything	redirects	redirects_id	0
-	everything	PRIMARY		everything	releases	releases_id	0
-	everything	PRIMARY		everything	revision	inside_workspace	1
-	everything	PRIMARY		everything	revision	node_id	0
-	everything	PRIMARY		everything	revision	revision_id	2
-	everything	PRIMARY		everything	setting	setting_id	0
-	everything	PRIMARY		everything	symlink	symlink_id	0
-	everything	PRIMARY		everything	themesetting	themesetting_id	0
-	everything	PRIMARY		everything	typeversion	typeversion_id	0
-	everything	PRIMARY		everything	user	user_id	0
-	everything	PRIMARY		everything	version	version_id	0
-	everything	PRIMARY		everything	weblog	entry_id	0
-	everything	PRIMARY		everything	workspace	workspace_id	0
+	everything	PRIMARY		everything	branch	branch_id	1
+	everything	PRIMARY		everything	container	container_id	1
+	everything	PRIMARY		everything	document	document_id	1
+	everything	PRIMARY		everything	genstats_attributes	genstats_attributes_id	1
+	everything	PRIMARY		everything	htmlcode	htmlcode_id	1
+	everything	PRIMARY		everything	htmlpage	htmlpage_id	1
+	everything	PRIMARY		everything	image	image_id	1
+	everything	PRIMARY		everything	javascript	javascript_id	1
+	everything	PRIMARY		everything	knowledge_item	knowledge_item_id	1
+	everything	PRIMARY		everything	links	from_node	1
+	everything	PRIMARY		everything	links	linktype	3
+	everything	PRIMARY		everything	links	to_node	2
+	everything	PRIMARY		everything	mail	mail_id	1
+	everything	PRIMARY		everything	node	node_id	1
+	everything	PRIMARY		everything	nodegroup	nodegroup_id	1
+	everything	PRIMARY		everything	nodegroup	rank	2
+	everything	PRIMARY		everything	nodelet	nodelet_id	1
+	everything	PRIMARY		everything	nodemethod	nodemethod_id	1
+	everything	PRIMARY		everything	nodetype	nodetype_id	1
+	everything	PRIMARY		everything	project	project_id	1
+	everything	PRIMARY		everything	project_document	project_document_id	1
+	everything	PRIMARY		everything	question	question_id	1
+	everything	PRIMARY		everything	question	rank	2
+	everything	PRIMARY		everything	redirects	redirects_id	1
+	everything	PRIMARY		everything	releases	releases_id	1
+	everything	PRIMARY		everything	revision	inside_workspace	2
+	everything	PRIMARY		everything	revision	node_id	1
+	everything	PRIMARY		everything	revision	revision_id	3
+	everything	PRIMARY		everything	setting	setting_id	1
+	everything	PRIMARY		everything	symlink	symlink_id	1
+	everything	PRIMARY		everything	themesetting	themesetting_id	1
+	everything	PRIMARY		everything	typeversion	typeversion_id	1
+	everything	PRIMARY		everything	user	user_id	1
+	everything	PRIMARY		everything	version	version_id	1
+	everything	PRIMARY		everything	weblog	entry_id	1
+	everything	PRIMARY		everything	workspace	workspace_id	1
 drop schema everything;

=== modified file 'tests/include.am'
--- tests/include.am	2010-10-02 21:15:42 +0000
+++ tests/include.am	2010-10-06 01:14:00 +0000
@@ -22,8 +22,8 @@
 GENSCRIPTS =		tests/dtr tests/mtr tests/test-run
 PRESCRIPTS =		tests/test-run.pl tests/stress-test.pl
 PLUGIN_TESTS =		$(pandora_plugin_test_list)
-NORMAL_TESTS =		main,jp,tamil,$(PLUGIN_TESTS)
-ALL_TESTS =		main,big,jp,tamil,$(PLUGIN_TESTS)
+NORMAL_TESTS =		main,jp,tamil,regression,$(PLUGIN_TESTS)
+ALL_TESTS =		main,big,jp,tamil,regression,$(PLUGIN_TESTS)
 noinst_SCRIPTS =	$(GENSCRIPTS) $(PRESCRIPTS)
 CLEANFILES += 		$(GENSCRIPTS) tests/mtr
 

=== added directory 'tests/suite/regression'
=== added directory 'tests/suite/regression/r'
=== added file 'tests/suite/regression/r/654219.result'
--- tests/suite/regression/r/654219.result	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/r/654219.result	2010-10-06 01:14:00 +0000
@@ -0,0 +1,63 @@
+CREATE TABLE `prim_key` (
+`id` INT NOT NULL,
+`val` VARCHAR(20) COLLATE utf8_general_ci DEFAULT NULL,
+PRIMARY KEY (`id`)
+);
+CREATE TABLE `fore_key0` (
+`id` INT NOT NULL,
+`id_ref0` INT DEFAULT NULL,
+PRIMARY KEY (`id`),
+KEY `id_ref0` (`id_ref0`),
+CONSTRAINT `fore_key0_ibfk_1` FOREIGN KEY (`id_ref0`) REFERENCES
+`prim_key` (`id`)
+);
+CREATE TABLE `fore_key1` (
+`id` INT NOT NULL,
+`id_ref1` INT DEFAULT NULL,
+PRIMARY KEY (`id`),
+KEY `id_ref1` (`id_ref1`),
+CONSTRAINT `fore_key1_ibfk_1` FOREIGN KEY (`id_ref1`) REFERENCES
+`prim_key` (`id`) ON UPDATE CASCADE
+);
+SELECT CONSTRAINT_NAME,TABLE_NAME,COLUMN_NAME,ORDINAL_POSITION FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE;
+CONSTRAINT_NAME	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION
+PRIMARY	prim_key	id	1
+PRIMARY	fore_key1	id	1
+fore_key1_ibfk_1	fore_key1	id_ref1	1
+PRIMARY	fore_key0	id	1
+fore_key0_ibfk_1	fore_key0	id_ref0	1
+DROP TABLE fore_key1;
+DROP TABLE fore_key0;
+DROP TABLE prim_key;
+CREATE TABLE t1
+(
+s1 INT,
+s2 INT,
+s3 INT,
+PRIMARY KEY(s3)
+);
+CREATE TABLE t3
+(
+s1 INT,
+s2 INT,
+s3 INT,
+KEY(s1),
+CONSTRAINT CO FOREIGN KEY (s2)
+REFERENCES t1(s3)
+);
+SELECT CONSTRAINT_NAME,TABLE_NAME,COLUMN_NAME,ORDINAL_POSITION FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE;
+CONSTRAINT_NAME	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION
+CO	t3	s2	1
+PRIMARY	t1	s3	1
+DROP TABLE t3;
+DROP TABLE t1;
+CREATE TABLE t1 (c1 INT NOT NULL, c2 INT NOT NULL, c3 CHAR(5), c4 INT, c5 INT, constraint pk_t1 PRIMARY KEY (c5,c4));
+CREATE TABLE T2 (tc1 INT NOT NULL, c1 INT NOT NULL, c2 INT NOT NULL, c5 CHAR(5), constraint fk_t2 FOREIGN KEY (c1,c2) REFERENCES t1 (c5,c4));
+SELECT CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME, ORDINAL_POSITION FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE TABLE_NAME IN ('t1', 't2');
+CONSTRAINT_NAME	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION
+PRIMARY	t1	c5	1
+PRIMARY	t1	c4	2
+fk_t2	t2	c1	1
+fk_t2	t2	c2	2
+DROP TABLE t2;
+DROP TABLE t1;

=== added directory 'tests/suite/regression/t'
=== added file 'tests/suite/regression/t/654219.test'
--- tests/suite/regression/t/654219.test	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/t/654219.test	2010-10-06 01:14:00 +0000
@@ -0,0 +1,64 @@
+CREATE TABLE `prim_key` (
+  `id` INT NOT NULL,
+  `val` VARCHAR(20) COLLATE utf8_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `fore_key0` (
+  `id` INT NOT NULL,
+  `id_ref0` INT DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `id_ref0` (`id_ref0`),
+  CONSTRAINT `fore_key0_ibfk_1` FOREIGN KEY (`id_ref0`) REFERENCES
+  `prim_key` (`id`)
+);
+
+CREATE TABLE `fore_key1` (
+  `id` INT NOT NULL,
+  `id_ref1` INT DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `id_ref1` (`id_ref1`),
+  CONSTRAINT `fore_key1_ibfk_1` FOREIGN KEY (`id_ref1`) REFERENCES
+  `prim_key` (`id`) ON UPDATE CASCADE
+);
+
+SELECT CONSTRAINT_NAME,TABLE_NAME,COLUMN_NAME,ORDINAL_POSITION FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE;
+
+DROP TABLE fore_key1;
+DROP TABLE fore_key0;
+DROP TABLE prim_key;
+
+# Taken from MySQL example
+CREATE TABLE t1
+(
+  s1 INT,
+  s2 INT,
+  s3 INT,
+  PRIMARY KEY(s3)
+);
+
+CREATE TABLE t3
+(
+  s1 INT,
+  s2 INT,
+  s3 INT,
+  KEY(s1),
+  CONSTRAINT CO FOREIGN KEY (s2)
+  REFERENCES t1(s3)
+);
+
+SELECT CONSTRAINT_NAME,TABLE_NAME,COLUMN_NAME,ORDINAL_POSITION FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE;
+
+DROP TABLE t3;
+DROP TABLE t1;
+
+# Taken from SQL Server example
+CREATE TABLE t1 (c1 INT NOT NULL, c2 INT NOT NULL, c3 CHAR(5), c4 INT, c5 INT, constraint pk_t1 PRIMARY KEY (c5,c4));
+
+CREATE TABLE T2 (tc1 INT NOT NULL, c1 INT NOT NULL, c2 INT NOT NULL, c5 CHAR(5), constraint fk_t2 FOREIGN KEY (c1,c2) REFERENCES t1 (c5,c4));
+
+SELECT CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME, ORDINAL_POSITION FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE TABLE_NAME IN ('t1', 't2');
+
+DROP TABLE t2;
+DROP TABLE t1;
+