Merge lp:~mordred/drizzle/split-session-header into lp:drizzle/7.0

[Monty Taylor]

Split up session.h into a few different files, cleaned up where things where including things and got rid of the bits of session.h that required files to be included in the middle of the file.

[Brian Aker (brianaker)]

I just did this :)

We will need to merge it.

Unmerged revisions

2161. By Monty Taylor on 2011-02-12

Split apart session.h into smaller headers, which also removed the need for
us to have include statements in the middle of the file. While I was at it,
I converted daemon.c to c++.

2160. By Monty Taylor on 2011-02-11

Be consistent about include usage.

=== modified file 'drizzled/base.h'
--- drizzled/base.h	2011-01-11 22:30:08 +0000
+++ drizzled/base.h	2011-02-12 21:09:18 +0000
@@ -25,7 +25,7 @@
  * @TODO Convert HA_XXX defines into enums and/or bitmaps
  */
 
-#include "definitions.h"
+#include <drizzled/definitions.h>
 
 #ifndef DRIZZLED_BASE_H
 #define DRIZZLED_BASE_H

=== modified file 'drizzled/common.h'
--- drizzled/common.h	2011-01-04 04:05:27 +0000
+++ drizzled/common.h	2011-02-12 21:09:18 +0000
@@ -25,7 +25,6 @@
 #define DRIZZLED_COMMON_H
 
 #include <unistd.h>
-#include <stdint.h>
 #include <drizzled/korr.h>
 
 /*

=== added file 'drizzled/copy_info.h'
--- drizzled/copy_info.h	1970-01-01 00:00:00 +0000
+++ drizzled/copy_info.h	2011-02-12 21:09:18 +0000
@@ -0,0 +1,121 @@
+/* -*- 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 DRIZZLED_COPY_INFO_H
+#define DRIZZLED_COPY_INFO_H
+
+
+namespace drizzled
+{
+
+namespace plugin
+{
+class Client;
+class Scheduler;
+class EventObserverList;
+}
+
+namespace message
+{
+class Transaction;
+class Statement;
+class Resultset;
+}
+
+namespace internal
+{
+struct st_my_thread_var;
+}
+
+namespace table
+{
+class Placeholder;
+}
+
+class Lex_input_stream;
+class user_var_entry;
+class CopyField;
+class Table_ident;
+
+class TableShareInstance;
+
+extern char internal_table_name[2];
+extern char empty_c_string[1];
+extern const char **errmesg;
+
+#define TC_HEURISTIC_RECOVER_COMMIT   1
+#define TC_HEURISTIC_RECOVER_ROLLBACK 2
+extern uint32_t tc_heuristic_recover;
+
+/**
+  @brief
+  Local storage for proto that are tmp table. This should be enlarged
+  to hande the entire table-share for a local table. Once Hash is done,
+  we should consider exchanging the map for it.
+*/
+typedef std::map <std::string, message::Table> ProtoCache;
+
+/**
+  The COPY_INFO structure is used by INSERT/REPLACE code.
+  The schema of the row counting by the INSERT/INSERT ... ON DUPLICATE KEY
+  UPDATE code:
+    If a row is inserted then the copied variable is incremented.
+    If a row is updated by the INSERT ... ON DUPLICATE KEY UPDATE and the
+      new data differs from the old one then the copied and the updated
+      variables are incremented.
+    The touched variable is incremented if a row was touched by the update part
+      of the INSERT ... ON DUPLICATE KEY UPDATE no matter whether the row
+      was actually changed or not.
+*/
+class CopyInfo 
+{
+public:
+  ha_rows records; /**< Number of processed records */
+  ha_rows deleted; /**< Number of deleted records */
+  ha_rows updated; /**< Number of updated records */
+  ha_rows copied;  /**< Number of copied records */
+  ha_rows error_count;
+  ha_rows touched; /* Number of touched records */
+  enum enum_duplicates handle_duplicates;
+  int escape_char, last_errno;
+  bool ignore;
+  /* for INSERT ... UPDATE */
+  List<Item> *update_fields;
+  List<Item> *update_values;
+  /* for VIEW ... WITH CHECK OPTION */
+
+  CopyInfo() :
+    records(0),
+    deleted(0),
+    updated(0),
+    copied(0),
+    error_count(0),
+    touched(0),
+    escape_char(0),
+    last_errno(0),
+    ignore(0),
+    update_fields(0),
+    update_values(0)
+  { }
+
+};
+
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_COPY_INFO_H */

=== renamed file 'drizzled/copy_info.h' => 'drizzled/copy_info.h.moved'
=== renamed file 'drizzled/daemon.c' => 'drizzled/daemon.cc'
--- drizzled/daemon.c	2011-02-02 02:49:45 +0000
+++ drizzled/daemon.cc	2011-02-12 21:09:18 +0000
@@ -45,6 +45,9 @@
 #include <unistd.h>
 #include <sys/select.h>
 
+namespace drizzled
+{
+
 int daemonize(int nochdir, int noclose, int wait_sigusr1);
 int daemon_is_ready(void);
 void sigusr1_handler(int sig);
@@ -136,3 +139,5 @@
     }
     return (0);
 }
+
+} /* namespace drizzled */

=== modified file 'drizzled/definitions.h'
--- drizzled/definitions.h	2011-01-24 05:33:52 +0000
+++ drizzled/definitions.h	2011-02-12 21:09:18 +0000
@@ -27,10 +27,7 @@
 #define DRIZZLED_DEFINITIONS_H
 
 #include <drizzled/enum.h>
-
-#include <stdint.h>
-
-#include "common.h"
+#include <drizzled/common.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/filesort.cc'
--- drizzled/filesort.cc	2011-02-12 21:09:14 +0000
+++ drizzled/filesort.cc	2011-02-12 21:09:18 +0000
@@ -47,6 +47,7 @@
 #include <drizzled/atomics.h>
 #include <drizzled/global_buffer.h>
 
+#include <drizzled/sort_field.h>
 
 using namespace std;
 

=== modified file 'drizzled/function/get_user_var.cc'
--- drizzled/function/get_user_var.cc	2010-12-25 01:27:46 +0000
+++ drizzled/function/get_user_var.cc	2011-02-12 21:09:18 +0000
@@ -25,6 +25,7 @@
 #include <drizzled/item/null.h>
 #include <drizzled/sql_parse.h>
 #include <drizzled/session.h>
+#include <drizzled/user_var_entry.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/function/set_user_var.cc'
--- drizzled/function/set_user_var.cc	2010-12-25 01:27:46 +0000
+++ drizzled/function/set_user_var.cc	2011-02-12 21:09:18 +0000
@@ -23,6 +23,7 @@
 #include <drizzled/field/num.h>
 #include <drizzled/session.h>
 #include <drizzled/plugin/client.h>
+#include <drizzled/user_var_entry.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/function/user_var_as_out_param.cc'
--- drizzled/function/user_var_as_out_param.cc	2010-12-25 01:27:46 +0000
+++ drizzled/function/user_var_as_out_param.cc	2011-02-12 21:09:18 +0000
@@ -23,6 +23,7 @@
 
 #include <drizzled/function/user_var_as_out_param.h>
 #include <drizzled/session.h>
+#include <drizzled/user_var_entry.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/identifier/catalog.cc'
--- drizzled/identifier/catalog.cc	2011-02-12 21:09:14 +0000
+++ drizzled/identifier/catalog.cc	2011-02-12 21:09:18 +0000
@@ -24,6 +24,7 @@
 
 #include <drizzled/identifier.h>
 #include <drizzled/session.h>
+#include <drizzled/current_session.h>
 #include <drizzled/internal/my_sys.h>
 
 #include <drizzled/util/tablename_to_filename.h>

=== modified file 'drizzled/identifier/schema.cc'
--- drizzled/identifier/schema.cc	2011-02-12 21:09:14 +0000
+++ drizzled/identifier/schema.cc	2011-02-12 21:09:18 +0000
@@ -24,6 +24,7 @@
 
 #include <drizzled/identifier.h>
 #include <drizzled/session.h>
+#include <drizzled/current_session.h>
 #include <drizzled/internal/my_sys.h>
 
 #include <drizzled/util/tablename_to_filename.h>

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2011-02-12 21:09:14 +0000
+++ drizzled/include.am	2011-02-12 21:09:18 +0000
@@ -64,8 +64,12 @@
 			      drizzled/common.h \
 			      drizzled/comp_creator.h \
 			      drizzled/constrained_value.h \
+<<<<<<< TREE
 			      drizzled/copy_field.h \
 			      drizzled/copy_info.h \
+=======
+			      drizzled/copy_info.h \
+>>>>>>> MERGE-SOURCE
 			      drizzled/create_field.h \
 			      drizzled/current_session.h \
 			      drizzled/cursor.h \
@@ -406,6 +410,7 @@
 			      drizzled/show.h \
 			      drizzled/show_type.h \
 			      drizzled/signal_handler.h \
+			      drizzled/sort_field.h \
 			      drizzled/sql_base.h \
 			      drizzled/sql_error.h \
 			      drizzled/sql_lex.h \
@@ -734,7 +739,7 @@
 			   drizzled/locking/global.cc \
 			   drizzled/lookup_symbol.cc \
 			   drizzled/main.cc \
-			   drizzled/daemon.c \
+			   drizzled/daemon.cc \
 			   drizzled/message.cc \
 			   drizzled/message/cache.cc \
 			   drizzled/message/catalog.cc \

=== modified file 'drizzled/item/subselect.cc'
--- drizzled/item/subselect.cc	2011-02-09 22:48:12 +0000
+++ drizzled/item/subselect.cc	2011-02-12 21:09:18 +0000
@@ -39,7 +39,14 @@
 #include <drizzled/item/ref_null_helper.h>
 #include <drizzled/item/direct_ref.h>
 #include <drizzled/join.h>
+<<<<<<< TREE
 #include <drizzled/plugin/storage_engine.h>
+=======
+#include <drizzled/select_singlerow_subselect.h>
+#include <drizzled/select_max_min_finder_subselect.h>
+#include <drizzled/select_exists_subselect.h>
+#include <drizzled/select_union.h>
+>>>>>>> MERGE-SOURCE
 
 namespace drizzled
 {

=== modified file 'drizzled/item/sum.cc'
--- drizzled/item/sum.cc	2011-02-12 21:09:14 +0000
+++ drizzled/item/sum.cc	2011-02-12 21:09:18 +0000
@@ -36,6 +36,8 @@
 #include <drizzled/field/int64.h>
 #include <drizzled/field/date.h>
 #include <drizzled/field/datetime.h>
+#include <drizzled/unique.h>
+
 
 #include <drizzled/type/decimal.h>
 

=== modified file 'drizzled/join.h'
--- drizzled/join.h	2011-02-12 21:09:14 +0000
+++ drizzled/join.h	2011-02-12 21:09:18 +0000
@@ -33,6 +33,7 @@
 #include <drizzled/sql_select.h>
 =======
 #include <drizzled/sql_select.h>
+#include <drizzled/tmp_table_param.h>
 >>>>>>> MERGE-SOURCE
 #include <bitset>
 

=== modified file 'drizzled/lex_column.h'
--- drizzled/lex_column.h	2010-12-18 04:43:40 +0000
+++ drizzled/lex_column.h	2011-02-12 21:09:18 +0000
@@ -21,6 +21,8 @@
 #ifndef DRIZZLED_LEX_COLUMN_H
 #define DRIZZLED_LEX_COLUMN_H
 
+#include <drizzled/copy_info.h>
+
 namespace drizzled
 {
 

=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2011-02-12 21:09:14 +0000
+++ drizzled/main.cc	2011-02-12 21:09:18 +0000
@@ -95,8 +95,11 @@
 #include <drizzled/util/backtrace.h>
 >>>>>>> MERGE-SOURCE
 
-extern "C" int daemonize(int nochdir, int noclose, int wait_sigusr1);
-extern "C" int daemon_is_ready(void);
+namespace drizzled
+{
+extern int daemonize(int nochdir, int noclose, int wait_sigusr1);
+extern int daemon_is_ready(void);
+}
 
 using namespace drizzled;
 using namespace std;
@@ -114,7 +117,7 @@
 */
 static void my_message_sql(drizzled::error_t error, const char *str, myf MyFlags)
 {
-  Session *session;
+  drizzled::Session *session;
   /*
     Put here following assertion when situation with EE_* error codes
     will be fixed
@@ -373,11 +376,11 @@
   ReplicationServices &replication_services= ReplicationServices::singleton();
     (void) replication_services.evaluateRegisteredPlugins();
 
-  if (plugin::Listen::setup())
+  if (drizzled::plugin::Listen::setup())
     unireg_abort(1);
 
-  assert(plugin::num_trx_monitored_objects > 0);
-  if (drizzle_rm_tmp_tables() || my_tz_init((Session *)0, default_tz_name))
+  assert(drizzled::plugin::num_trx_monitored_objects > 0);
+  if (drizzle_rm_tmp_tables() || my_tz_init(NULL, default_tz_name))
   {
     abort_loop= true;
     select_thread_in_use=0;
@@ -396,9 +399,9 @@
 
   /* Send server startup event */
   {
-    Session::shared_ptr session;
+    drizzled::Session::shared_ptr session;
 
-    if ((session= Session::make_shared(plugin::Listen::getNullClient(), catalog::local())))
+    if ((session= drizzled::Session::make_shared(drizzled::plugin::Listen::getNullClient(), catalog::local())))
     {
       currentSession().release();
       currentSession().reset(session.get());
@@ -418,11 +421,11 @@
      accepted. The listen.getClient() method will return NULL when the server
      should be shutdown.
    */
-  plugin::Client *client;
-  while ((client= plugin::Listen::getClient()) != NULL)
+  drizzled::plugin::Client *client;
+  while ((client= drizzled::plugin::Listen::getClient()) != NULL)
   {
-    Session::shared_ptr session;
-    session= Session::make_shared(client, client->catalog());
+    drizzled::Session::shared_ptr session;
+    session= drizzled::Session::make_shared(client, client->catalog());
 
     if (not session)
     {
@@ -431,15 +434,15 @@
     }
 
     /* If we error on creation we drop the connection and delete the session. */
-    if (Session::schedule(session))
-      Session::unlink(session);
+    if (drizzled::Session::schedule(session))
+      drizzled::Session::unlink(session);
   }
 
   /* Send server shutdown event */
   {
-    Session::shared_ptr session;
+    drizzled::Session::shared_ptr session;
 
-    if ((session= Session::make_shared(plugin::Listen::getNullClient(), catalog::local())))
+    if ((session= drizzled::Session::make_shared(drizzled::plugin::Listen::getNullClient(), catalog::local())))
     {
       currentSession().release();
       currentSession().reset(session.get());

=== modified file 'drizzled/module/loader.cc'
--- drizzled/module/loader.cc	2011-02-12 21:09:14 +0000
+++ drizzled/module/loader.cc	2011-02-12 21:09:18 +0000
@@ -519,7 +519,6 @@
   session->variables.storage_engine= NULL;
 
   /* we are going to allocate these lazily */
-  session->variables.dynamic_variables_version= 0;
   session->variables.dynamic_variables_size= 0;
   session->variables.dynamic_variables_ptr= 0;
 
@@ -549,7 +548,6 @@
   free(vars->dynamic_variables_ptr);
   vars->dynamic_variables_ptr= NULL;
   vars->dynamic_variables_size= 0;
-  vars->dynamic_variables_version= 0;
 }
 
 

=== modified file 'drizzled/optimizer/quick_index_merge_select.cc'
--- drizzled/optimizer/quick_index_merge_select.cc	2011-02-12 21:09:14 +0000
+++ drizzled/optimizer/quick_index_merge_select.cc	2011-02-12 21:09:18 +0000
@@ -24,6 +24,7 @@
 #include <drizzled/optimizer/quick_range_select.h>
 #include <drizzled/optimizer/quick_index_merge_select.h>
 #include <drizzled/internal/m_string.h>
+#include <drizzled/unique.h>
 
 #include <vector>
 

=== modified file 'drizzled/optimizer/range.cc'
--- drizzled/optimizer/range.cc	2011-02-12 21:09:14 +0000
+++ drizzled/optimizer/range.cc	2011-02-12 21:09:18 +0000
@@ -161,6 +161,7 @@
 #include <drizzled/records.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/internal/iocache.h>
+#include <drizzled/unique.h>
 >>>>>>> MERGE-SOURCE
 
 #include <drizzled/temporal.h> /* Needed in get_mm_leaf() for timestamp -> datetime comparisons */

=== modified file 'drizzled/select_create.h'
--- drizzled/select_create.h	2011-01-17 06:41:24 +0000
+++ drizzled/select_create.h	2011-02-12 21:09:18 +0000
@@ -20,6 +20,8 @@
 #ifndef DRIZZLED_SELECT_CREATE_H
 #define DRIZZLED_SELECT_CREATE_H
 
+#include <drizzled/select_insert.h>
+
 namespace drizzled
 {
 

=== modified file 'drizzled/select_dump.h'
--- drizzled/select_dump.h	2010-12-18 04:43:40 +0000
+++ drizzled/select_dump.h	2011-02-12 21:09:18 +0000
@@ -21,6 +21,8 @@
 #ifndef DRIZZLED_SELECT_DUMP_H
 #define DRIZZLED_SELECT_DUMP_H
 
+#include <drizzled/select_to_file.h>
+
 namespace drizzled
 {
 

=== modified file 'drizzled/select_dumpvar.h'
--- drizzled/select_dumpvar.h	2011-02-12 21:09:14 +0000
+++ drizzled/select_dumpvar.h	2011-02-12 21:09:18 +0000
@@ -22,6 +22,7 @@
 
 #include <drizzled/error.h>
 #include <drizzled/function/set_user_var.h>
+#include <drizzled/var.h>
 
 #include <vector>
 

=== modified file 'drizzled/select_singlerow_subselect.h'
--- drizzled/select_singlerow_subselect.h	2010-12-18 04:43:40 +0000
+++ drizzled/select_singlerow_subselect.h	2011-02-12 21:09:18 +0000
@@ -21,6 +21,8 @@
 #ifndef DRIZZLED_SELECT_SINGLEROW_SUBSELECT_H
 #define DRIZZLED_SELECT_SINGLEROW_SUBSELECT_H
 
+#include <drizzled/select_subselect.h>
+
 namespace drizzled
 {
 

=== modified file 'drizzled/session.cc'
--- drizzled/session.cc	2011-02-12 21:09:14 +0000
+++ drizzled/session.cc	2011-02-12 21:09:18 +0000
@@ -117,6 +117,23 @@
 
 #include <drizzled/util/backtrace.h>
 
+#include <drizzled/table_ident.h>
+#include <drizzled/user_var_entry.h>
+#include <drizzled/unique.h>
+#include <drizzled/var.h>
+
+#include <drizzled/select_to_file.h>
+#include <drizzled/select_export.h>
+#include <drizzled/select_dump.h>
+#include <drizzled/select_insert.h>
+#include <drizzled/select_create.h>
+#include <drizzled/tmp_table_param.h>
+#include <drizzled/select_union.h>
+#include <drizzled/select_subselect.h>
+#include <drizzled/select_singlerow_subselect.h>
+#include <drizzled/select_max_min_finder_subselect.h>
+#include <drizzled/select_exists_subselect.h>
+
 using namespace std;
 
 namespace fs=boost::filesystem;

=== modified file 'drizzled/session.h'
--- drizzled/session.h	2011-02-12 21:09:14 +0000
+++ drizzled/session.h	2011-02-12 21:09:18 +0000
@@ -104,9 +104,6 @@
 #include "drizzled/sql_lex.h"
 
 #include "drizzled/visibility.h"
-=======
-#include <drizzled/visibility.h>
->>>>>>> MERGE-SOURCE
 
 #define MIN_HANDSHAKE_SIZE      6
 
@@ -146,22 +143,45 @@
 #define TC_HEURISTIC_RECOVER_ROLLBACK 2
 extern uint32_t tc_heuristic_recover;
 
+=======
+#include <drizzled/visibility.h>
+
+#include <drizzled/lex_column.h>
+#include <drizzled/sql_lex.h>
+
+namespace drizzled
+{
+
+>>>>>>> MERGE-SOURCE
 class select_result;
-class Time_zone;
+class Join;
 
 #define Session_SENTRY_MAGIC 0xfeedd1ff
 #define Session_SENTRY_GONE  0xdeadbeef
+<<<<<<< TREE
 
 extern DRIZZLED_API struct drizzle_system_variables global_system_variables;
 
-<<<<<<< TREE
 =======
-} /* namespace drizzled */
-
-#include <drizzled/sql_lex.h>
-
-namespace drizzled
+#define ESCAPE_CHARS "ntrb0ZN" // keep synchronous with READ_INFO::unescape
+
+/* Bits in sql_command_flags */
+
+enum sql_command_flag_bits
 {
+  CF_BIT_CHANGES_DATA,
+  CF_BIT_HAS_ROW_COUNT,
+  CF_BIT_STATUS_COMMAND,
+  CF_BIT_SHOW_TABLE_COMMAND,
+  CF_BIT_WRITE_LOGS_COMMAND,
+  CF_BIT_SIZE
+};
+
+static const std::bitset<CF_BIT_SIZE> CF_CHANGES_DATA(1 << CF_BIT_CHANGES_DATA);
+static const std::bitset<CF_BIT_SIZE> CF_HAS_ROW_COUNT(1 << CF_BIT_HAS_ROW_COUNT);
+static const std::bitset<CF_BIT_SIZE> CF_STATUS_COMMAND(1 << CF_BIT_STATUS_COMMAND);
+static const std::bitset<CF_BIT_SIZE> CF_SHOW_TABLE_COMMAND(1 << CF_BIT_SHOW_TABLE_COMMAND);
+static const std::bitset<CF_BIT_SIZE> CF_WRITE_LOGS_COMMAND(1 << CF_BIT_WRITE_LOGS_COMMAND);
 
 /**
   Storage engine specific thread local data.
@@ -1756,85 +1776,6 @@
   struct rusage usage;
 };
 
-class Join;
-
-#define ESCAPE_CHARS "ntrb0ZN" // keep synchronous with READ_INFO::unescape
-
-} /* namespace drizzled */
-
-/** @TODO why is this in the middle of the file */
-#include <drizzled/select_to_file.h>
-#include <drizzled/select_export.h>
-#include <drizzled/select_dump.h>
-#include <drizzled/select_insert.h>
-#include <drizzled/select_create.h>
-#include <drizzled/tmp_table_param.h>
-#include <drizzled/select_union.h>
-#include <drizzled/select_subselect.h>
-#include <drizzled/select_singlerow_subselect.h>
-#include <drizzled/select_max_min_finder_subselect.h>
-#include <drizzled/select_exists_subselect.h>
-
-namespace drizzled
-{
-
-/**
- * A structure used to describe sort information
- * for a field or item used in ORDER BY.
- */
-class SortField 
-{
-public:
-  Field *field;	/**< Field to sort */
-  Item	*item; /**< Item if not sorting fields */
-  size_t length; /**< Length of sort field */
-  uint32_t suffix_length; /**< Length suffix (0-4) */
-  Item_result result_type; /**< Type of item */
-  bool reverse; /**< if descending sort */
-  bool need_strxnfrm;	/**< If we have to use strxnfrm() */
-
-  SortField() :
-    field(0),
-    item(0),
-    length(0),
-    suffix_length(0),
-    result_type(STRING_RESULT),
-    reverse(0),
-    need_strxnfrm(0)
-  { }
-
-};
-
-} /* namespace drizzled */
-
-/** @TODO why is this in the middle of the file */
-
-#include <drizzled/table_ident.h>
-#include <drizzled/user_var_entry.h>
-#include <drizzled/unique.h>
-#include <drizzled/var.h>
-#include <drizzled/select_dumpvar.h>
-
-namespace drizzled
-{
-
-/* Bits in sql_command_flags */
-
-enum sql_command_flag_bits 
-{
-  CF_BIT_CHANGES_DATA,
-  CF_BIT_HAS_ROW_COUNT,
-  CF_BIT_STATUS_COMMAND,
-  CF_BIT_SHOW_TABLE_COMMAND,
-  CF_BIT_WRITE_LOGS_COMMAND,
-  CF_BIT_SIZE
-};
-
-static const std::bitset<CF_BIT_SIZE> CF_CHANGES_DATA(1 << CF_BIT_CHANGES_DATA);
-static const std::bitset<CF_BIT_SIZE> CF_HAS_ROW_COUNT(1 << CF_BIT_HAS_ROW_COUNT);
-static const std::bitset<CF_BIT_SIZE> CF_STATUS_COMMAND(1 << CF_BIT_STATUS_COMMAND);
-static const std::bitset<CF_BIT_SIZE> CF_SHOW_TABLE_COMMAND(1 << CF_BIT_SHOW_TABLE_COMMAND);
-static const std::bitset<CF_BIT_SIZE> CF_WRITE_LOGS_COMMAND(1 << CF_BIT_WRITE_LOGS_COMMAND);
 
 namespace display  {
 const std::string &type(drizzled::Session::global_read_lock_t type);

=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2011-02-12 21:09:14 +0000
+++ drizzled/set_var.cc	2011-02-12 21:09:18 +0000
@@ -27,6 +27,8 @@
 #include <drizzled/item/string.h>
 #include <drizzled/sql_list.h>
 
+#include <drizzled/function/set_user_var.h>
+
 using namespace std;
 
 namespace drizzled

=== modified file 'drizzled/set_var.h'
--- drizzled/set_var.h	2011-02-12 21:09:14 +0000
+++ drizzled/set_var.h	2011-02-12 21:09:18 +0000
@@ -37,7 +37,6 @@
 class sys_var;
 class Item;
 class Item_func_set_user_var;
-class Time_zone;
 typedef struct my_locale_st MY_LOCALE;
 typedef struct charset_info_st CHARSET_INFO;
 

=== modified file 'drizzled/show.cc'
--- drizzled/show.cc	2011-02-12 21:09:14 +0000
+++ drizzled/show.cc	2011-02-12 21:09:18 +0000
@@ -75,6 +75,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <drizzled/table_ident.h>
+
 using namespace std;
 
 namespace drizzled

=== added file 'drizzled/sort_field.h'
--- drizzled/sort_field.h	1970-01-01 00:00:00 +0000
+++ drizzled/sort_field.h	2011-02-12 21:09:18 +0000
@@ -0,0 +1,70 @@
+/* -*- 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 DRIZZLED_SORT_FIELD_H
+#define DRIZZLED_SORT_FIELD_H
+
+#include <drizzled/session.h>
+#include <drizzled/select_to_file.h>
+#include <drizzled/select_export.h>
+#include <drizzled/select_dump.h>
+#include <drizzled/select_insert.h>
+#include <drizzled/select_create.h>
+#include <drizzled/tmp_table_param.h>
+#include <drizzled/select_union.h>
+#include <drizzled/select_subselect.h>
+#include <drizzled/select_singlerow_subselect.h>
+#include <drizzled/select_max_min_finder_subselect.h>
+#include <drizzled/select_exists_subselect.h>
+
+namespace drizzled
+{
+
+/**
+ * A structure used to describe sort information
+ * for a field or item used in ORDER BY.
+ */
+class SortField 
+{
+public:
+  Field *field;	/**< Field to sort */
+  Item	*item; /**< Item if not sorting fields */
+  size_t length; /**< Length of sort field */
+  uint32_t suffix_length; /**< Length suffix (0-4) */
+  Item_result result_type; /**< Type of item */
+  bool reverse; /**< if descending sort */
+  bool need_strxnfrm;	/**< If we have to use strxnfrm() */
+
+  SortField() :
+    field(0),
+    item(0),
+    length(0),
+    suffix_length(0),
+    result_type(STRING_RESULT),
+    reverse(0),
+    need_strxnfrm(0)
+  { }
+
+};
+
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_SORT_FIELD_H */

=== modified file 'drizzled/sql_derived.cc'
--- drizzled/sql_derived.cc	2011-02-12 21:09:14 +0000
+++ drizzled/sql_derived.cc	2011-02-12 21:09:18 +0000
@@ -19,6 +19,7 @@
 */
 #include "config.h"
 #include <drizzled/sql_select.h>
+#include <drizzled/select_union.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/sql_insert.cc'
--- drizzled/sql_insert.cc	2011-02-12 21:09:14 +0000
+++ drizzled/sql_insert.cc	2011-02-12 21:09:18 +0000
@@ -33,6 +33,8 @@
 #include <drizzled/plugin/transactional_storage_engine.h>
 
 #include <drizzled/table/shell.h>
+#include <drizzled/select_insert.h>
+#include <drizzled/select_create.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/sql_lex.h'
--- drizzled/sql_lex.h	2011-02-12 21:09:14 +0000
+++ drizzled/sql_lex.h	2011-02-12 21:09:18 +0000
@@ -37,6 +37,7 @@
 #include <drizzled/index_hint.h>
 #include <drizzled/statement.h>
 #include <drizzled/optimizer/explain_plan.h>
+#include <drizzled/system_variables.h>
 
 #include <bitset>
 #include <string>

=== modified file 'drizzled/sql_parse.cc'
--- drizzled/sql_parse.cc	2011-02-12 21:09:14 +0000
+++ drizzled/sql_parse.cc	2011-02-12 21:09:18 +0000
@@ -65,6 +65,7 @@
 #include <algorithm>
 #include <boost/date_time.hpp>
 #include <drizzled/internal/my_sys.h>
+#include <drizzled/table_ident.h>
 
 using namespace std;
 

=== modified file 'drizzled/sql_select.cc'
--- drizzled/sql_select.cc	2011-02-12 21:09:14 +0000
+++ drizzled/sql_select.cc	2011-02-12 21:09:18 +0000
@@ -100,6 +100,7 @@
 #include <drizzled/optimizer/quick_ror_intersect_select.h>
 
 #include <drizzled/filesort.h>
+#include <drizzled/sort_field.h>
 >>>>>>> MERGE-SOURCE
 
 using namespace std;

=== modified file 'drizzled/sql_union.cc'
--- drizzled/sql_union.cc	2010-12-24 07:15:43 +0000
+++ drizzled/sql_union.cc	2011-02-12 21:09:18 +0000
@@ -23,6 +23,7 @@
 #include <drizzled/item/type_holder.h>
 #include <drizzled/sql_base.h>
 #include <drizzled/sql_union.h>
+#include <drizzled/select_union.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2011-02-12 21:09:14 +0000
+++ drizzled/sql_yacc.yy	2011-02-12 21:09:18 +0000
@@ -40,6 +40,12 @@
 #include "config.h"
 #include <cstdio>
 #include <drizzled/parser.h>
+#include <drizzled/table_ident.h>
+#include <drizzled/function/set_user_var.h>
+#include <drizzled/select_dumpvar.h>
+#include <drizzled/select_dump.h>
+#include <drizzled/select_export.h>
+#include <drizzled/select_result.h>
 
 int yylex(void *yylval, void *yysession);
 

=== modified file 'drizzled/statement/create_table.cc'
--- drizzled/statement/create_table.cc	2011-02-09 22:48:12 +0000
+++ drizzled/statement/create_table.cc	2011-02-12 21:09:18 +0000
@@ -25,7 +25,12 @@
 #include <drizzled/statement/create_table.h>
 #include <drizzled/message.h>
 #include <drizzled/identifier.h>
+<<<<<<< TREE
 #include <drizzled/plugin/storage_engine.h>
+=======
+#include <drizzled/table_ident.h>
+#include <drizzled/select_create.h>
+>>>>>>> MERGE-SOURCE
 
 #include <iostream>
 

=== modified file 'drizzled/statement/insert_select.cc'
--- drizzled/statement/insert_select.cc	2011-01-22 07:05:32 +0000
+++ drizzled/statement/insert_select.cc	2011-02-12 21:09:18 +0000
@@ -24,6 +24,7 @@
 #include <drizzled/session.h>
 #include <drizzled/probes.h>
 #include <drizzled/statement/insert_select.h>
+#include <drizzled/select_insert.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/statement/replace_select.cc'
--- drizzled/statement/replace_select.cc	2011-01-22 07:05:32 +0000
+++ drizzled/statement/replace_select.cc	2011-02-12 21:09:18 +0000
@@ -23,6 +23,8 @@
 #include <drizzled/lock.h>
 #include <drizzled/session.h>
 #include <drizzled/statement/replace_select.h>
+#include <drizzled/select_insert.h>
+#include <drizzled/select_result.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/sys_var.h'
--- drizzled/sys_var.h	2011-02-12 21:09:14 +0000
+++ drizzled/sys_var.h	2011-02-12 21:09:18 +0000
@@ -26,6 +26,7 @@
 #include <drizzled/constrained_value.h>
 #include <drizzled/set_var.h>
 #include <drizzled/show_type.h>
+#include <drizzled/typelib.h>
 #include <drizzled/item_result.h>
 #include <drizzled/base.h>
 #include <drizzled/global_charset_info.h>
@@ -37,7 +38,6 @@
 {
 
 class sys_var;
-class Time_zone;
 typedef struct my_locale_st MY_LOCALE;
 typedef struct st_typelib TYPELIB;
 

=== added file 'drizzled/system_variables.h'
--- drizzled/system_variables.h	1970-01-01 00:00:00 +0000
+++ drizzled/system_variables.h	2011-02-12 21:09:18 +0000
@@ -0,0 +1,115 @@
+/* -*- 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 DRIZZLED_SYSTEM_VARIABLES_H
+#define DRIZZLED_SYSTEM_VARIABLES_H
+
+#include <drizzled/base.h>
+#include <drizzled/visibility.h>
+
+namespace drizzled
+{
+
+namespace plugin
+{
+class StorageEngine;
+}
+
+class Time_zone;
+typedef struct charset_info_st CHARSET_INFO;
+typedef struct my_locale_st MY_LOCALE;
+
+struct drizzle_system_variables
+{
+  drizzle_system_variables()
+  {}
+  /*
+    How dynamically allocated system variables are handled:
+
+    The global_system_variables and max_system_variables are "authoritative"
+    They both should have the same 'version' and 'size'.
+    When attempting to access a dynamic variable, if the session version
+    is out of date, then the session version is updated and realloced if
+    neccessary and bytes copied from global to make up for missing data.
+  */
+  char * dynamic_variables_ptr;
+  uint32_t dynamic_variables_head;  /* largest valid variable offset */
+  uint32_t dynamic_variables_size;  /* how many bytes are in use */
+
+  uint64_t myisam_max_extra_sort_file_size;
+  uint64_t max_heap_table_size;
+  uint64_t tmp_table_size;
+  ha_rows select_limit;
+  ha_rows max_join_size;
+  uint64_t auto_increment_increment;
+  uint64_t auto_increment_offset;
+  uint64_t bulk_insert_buff_size;
+  uint64_t join_buff_size;
+  uint32_t max_allowed_packet;
+  uint64_t max_error_count;
+  uint64_t max_length_for_sort_data;
+  size_t max_sort_length;
+  uint64_t min_examined_row_limit;
+  bool optimizer_prune_level;
+  bool log_warnings;
+
+  uint32_t optimizer_search_depth;
+  uint32_t div_precincrement;
+  uint64_t preload_buff_size;
+  uint32_t read_buff_size;
+  uint32_t read_rnd_buff_size;
+  bool replicate_query;
+  size_t sortbuff_size;
+  uint32_t thread_handling;
+  uint32_t tx_isolation;
+  size_t transaction_message_threshold;
+  uint32_t completion_type;
+  /* Determines which non-standard SQL behaviour should be enabled */
+  uint32_t sql_mode;
+  uint64_t max_seeks_for_key;
+  size_t range_alloc_block_size;
+  uint32_t query_alloc_block_size;
+  uint32_t query_prealloc_size;
+  uint64_t group_concat_max_len;
+  uint64_t pseudo_thread_id;
+
+  plugin::StorageEngine *storage_engine;
+
+  /* Only charset part of these variables is sensible */
+  const CHARSET_INFO  *character_set_filesystem;
+
+  /* Both charset and collation parts of these variables are important */
+  const CHARSET_INFO	*collation_server;
+
+  inline const CHARSET_INFO  *getCollation(void) 
+  {
+    return collation_server;
+  }
+
+  /* Locale Support */
+  MY_LOCALE *lc_time_names;
+
+  Time_zone *time_zone;
+};
+
+extern DRIZZLED_API struct drizzle_system_variables global_system_variables;
+
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_SYSTEM_VARIABLES_H */

=== renamed file 'drizzled/system_variables.h' => 'drizzled/system_variables.h.moved'
=== modified file 'drizzled/unique.cc'
--- drizzled/unique.cc	2011-02-12 21:09:14 +0000
+++ drizzled/unique.cc	2011-02-12 21:09:18 +0000
@@ -36,6 +36,7 @@
 #include <drizzled/session.h>
 #include <drizzled/sql_list.h>
 #include <drizzled/internal/iocache.h>
+#include <drizzled/unique.h>
 
 #if defined(CMATH_NAMESPACE)
 using namespace CMATH_NAMESPACE;

=== modified file 'drizzled/user_var_entry.cc'
--- drizzled/user_var_entry.cc	2011-02-12 21:09:14 +0000
+++ drizzled/user_var_entry.cc	2011-02-12 21:09:18 +0000
@@ -20,6 +20,7 @@
 #include "config.h"
 #include <drizzled/session.h>
 #include <drizzled/internal/m_string.h>
+#include <drizzled/user_var_entry.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/user_var_entry.h'
--- drizzled/user_var_entry.h	2011-02-12 21:09:14 +0000
+++ drizzled/user_var_entry.h	2011-02-12 21:09:18 +0000
@@ -22,10 +22,19 @@
 #define DRIZZLED_USER_VAR_ENTRY_H
 
 #include <drizzled/query_id.h>
+#include <drizzled/lex_string.h>
+#include <drizzled/item_result.h>
+#include <drizzled/sql_string.h>
+#include <drizzled/dtcollation.h>
 
 namespace drizzled
 {
 
+namespace type
+{
+class Decimal;
+}
+
 // this is needed for user_vars hash
 class user_var_entry
 {
@@ -54,7 +63,7 @@
   }
   LEX_STRING name;
   char *value;
-  ulong length;
+  unsigned long length;
   size_t size;
   query_id_t update_query_id;
   query_id_t used_query_id;

=== modified file 'plugin/logging_stats/user_commands.cc'
--- plugin/logging_stats/user_commands.cc	2010-12-18 04:43:40 +0000
+++ plugin/logging_stats/user_commands.cc	2011-02-12 21:09:18 +0000
@@ -27,6 +27,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "user_commands.h"
 
 using namespace drizzled;

=== modified file 'plugin/mysql_protocol/mysql_protocol.cc'
--- plugin/mysql_protocol/mysql_protocol.cc	2011-02-12 21:09:14 +0000
+++ plugin/mysql_protocol/mysql_protocol.cc	2011-02-12 21:09:18 +0000
@@ -35,7 +35,6 @@
 
 #include <drizzled/identifier.h>
 
-#define PROTOCOL_VERSION 10
 
 namespace po= boost::program_options;
 using namespace std;
@@ -44,6 +43,9 @@
 namespace drizzle_plugin
 {
 
+static const uint32_t PROTOCOL_VERSION= 10;
+static const uint32_t MIN_HANDSHAKE_SIZE= 6;
+
 std::vector<std::string> ClientMySQLProtocol::mysql_admin_ip_addresses;
 static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;
 

=== modified file 'plugin/session_dictionary/variables.cc'
--- plugin/session_dictionary/variables.cc	2011-02-12 21:09:14 +0000
+++ plugin/session_dictionary/variables.cc	2011-02-12 21:09:18 +0000
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <drizzled/user_var_entry.h>
 #include <plugin/session_dictionary/dictionary.h>
 
 #define LARGEST_USER_VARIABLE_NAME 128