Merge lp:~mordred/drizzle/drizzled-as-lib into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

Changed the build to build most of the code as a shared lib and then link that into the drizzled binary. This does _NOT_ make it any sort of embedded server or make the lib particularly useful - except for pre-linking plugins against for link-time symbol resolution checking. It will also make it easier for us to start applying visibility structures to objects. YAY ABI!

[Eric Day (eday)]

Looks great! Excited to get the new main.cc whittled down even more.

review: Approve

[Monty Taylor (mordred)]

Slight issue with the gdbinit file when starting from mtr I need to fix...

[Monty Taylor (mordred)]

Got it.

[Brian Aker (brianaker)]

Hi!

This has some of the DRIZZLE_DECLARE_PLUGIN patch in it. This needs to be submitted without it.

Cheers,
  -Brian

review: Needs Fixing

[Monty Taylor (mordred)]

Merged up with latest in trunk and removed the drizzle-declare-plugin branch.

[lp:~mordred/drizzle/drizzled-as-lib]

1475. By Monty Taylor on 2010-04-16

Merged trunk.

1476. By Monty Taylor on 2010-04-16

Fixed a symbol oops.

[Jay Pipes (jaypipes)]

Note that this also has the latest pandora build merged in as well...

[lp:~mordred/drizzle/drizzled-as-lib]

1477. By Monty Taylor on 2010-04-19

Merged up with build.

1478. By Monty Taylor on 2010-04-19

We need to launch drizzled via libtool now.

=== modified file 'Makefile.am'
--- Makefile.am	2010-04-16 00:08:16 +0000
+++ Makefile.am	2010-04-19 20:33:26 +0000
@@ -22,6 +22,7 @@
 noinst_HEADERS =
 nobase_nodist_include_HEADERS =
 nobase_dist_include_HEADERS =
+sbin_PROGRAMS =
 lib_LTLIBRARIES = 
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
@@ -124,11 +125,11 @@
 
 include config/lint-source.am
 
+include drizzled/message/include.am
 include drizzled/include.am
 include drizzled/internal/include.am
 include drizzled/algorithm/include.am
 include drizzled/util/include.am
-include drizzled/message/include.am
 include client/include.am
 include extra/include.am
 include support-files/include.am

=== modified file 'drizzled/cursor.cc'
--- drizzled/cursor.cc	2010-04-08 16:25:53 +0000
+++ drizzled/cursor.cc	2010-04-19 20:33:26 +0000
@@ -90,6 +90,30 @@
   return NULL;
 }
 
+/*
+  DESCRIPTION
+    given a buffer with a key value, and a map of keyparts
+    that are present in this value, returns the length of the value
+*/
+uint32_t Cursor::calculate_key_len(uint32_t key_position, key_part_map keypart_map_arg)
+{
+  /* works only with key prefixes */
+  assert(((keypart_map_arg + 1) & keypart_map_arg) == 0);
+
+  KEY *key_info_found= table->s->key_info + key_position;
+  KEY_PART_INFO *key_part_found= key_info_found->key_part;
+  KEY_PART_INFO *end_key_part_found= key_part_found + key_info_found->key_parts;
+  uint32_t length= 0;
+
+  while (key_part_found < end_key_part_found && keypart_map_arg)
+  {
+    length+= key_part_found->store_length;
+    keypart_map_arg >>= 1;
+    key_part_found++;
+  }
+  return length;
+}
+
 int Cursor::ha_index_init(uint32_t idx, bool sorted)
 {
   int result;

=== modified file 'drizzled/cursor.h'
--- drizzled/cursor.h	2010-04-09 11:55:54 +0000
+++ drizzled/cursor.h	2010-04-19 20:33:26 +0000
@@ -92,7 +92,6 @@
   class CostVector;
 }
 
-uint32_t calculate_key_len(Table *, uint, const unsigned char *, key_part_map);
 /*
   bitmap with first N+1 bits set
   (keypart_map for a key prefix of [0..N] keyparts)
@@ -357,11 +356,11 @@
      row if available. If the key value is null, begin at the first key of the
      index.
   */
-  virtual int index_read_map(unsigned char * buf, const unsigned char * key,
+  virtual int index_read_map(unsigned char * buf, const unsigned char *key,
                              key_part_map keypart_map,
                              enum ha_rkey_function find_flag)
   {
-    uint32_t key_len= calculate_key_len(table, active_index, key, keypart_map);
+    uint32_t key_len= calculate_key_len(active_index, keypart_map);
     return  index_read(buf, key, key_len, find_flag);
   }
   /**
@@ -383,6 +382,11 @@
   virtual int index_last(unsigned char *)
    { return  HA_ERR_WRONG_COMMAND; }
   virtual int index_next_same(unsigned char *, const unsigned char *, uint32_t);
+
+private:
+  uint32_t calculate_key_len(uint32_t key_position, key_part_map keypart_map_arg);
+public:
+
   /**
      @brief
      The following functions works like index_read, but it find the last
@@ -391,7 +395,7 @@
   virtual int index_read_last_map(unsigned char * buf, const unsigned char * key,
                                   key_part_map keypart_map)
   {
-    uint32_t key_len= calculate_key_len(table, active_index, key, keypart_map);
+    uint32_t key_len= calculate_key_len(active_index, keypart_map);
     return index_read_last(buf, key, key_len);
   }
   virtual int read_range_first(const key_range *start_key,
@@ -733,8 +737,7 @@
 
 bool mysql_rename_table(plugin::StorageEngine *base,
                         TableIdentifier &old_identifier,
-                        TableIdentifier &new_identifier,
-                        uint32_t flags);
+                        TableIdentifier &new_identifier);
 
 bool mysql_prepare_update(Session *session, TableList *table_list,
                           Item **conds, uint32_t order_num, order_st *order);

=== modified file 'drizzled/data_home.h'
--- drizzled/data_home.h	2010-02-04 08:14:46 +0000
+++ drizzled/data_home.h	2010-04-19 20:33:26 +0000
@@ -23,9 +23,11 @@
 namespace drizzled
 {
 
-extern uint32_t drizzle_data_home_len;
-extern char *drizzle_data_home,
-             drizzle_real_data_home[], drizzle_unpacked_real_data_home[];
+extern char *data_home;
+extern uint32_t data_home_len;
+extern char data_home_real[];
+extern char data_home_real_unpacked[];
+extern char data_home_buff[];
 
 } /* namespace drizzled */
 

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-04-07 15:56:28 +0000
+++ drizzled/drizzled.cc	2010-04-19 20:33:26 +0000
@@ -31,7 +31,6 @@
 #include "drizzled/internal/my_sys.h"
 #include "drizzled/internal/my_bit.h"
 #include <drizzled/my_hash.h>
-#include <drizzled/stacktrace.h>
 #include <drizzled/error.h>
 #include <drizzled/errmsg_print.h>
 #include <drizzled/tztime.h>
@@ -54,6 +53,7 @@
 #include "drizzled/session_list.h"
 #include "drizzled/charset.h"
 #include "plugin/myisam/myisam.h"
+#include "drizzled/drizzled.h"
 
 #include <google/protobuf/stubs/common.h>
 
@@ -73,8 +73,6 @@
 #endif
 #include <sys/socket.h>
 
-#include <locale.h>
-
 
 #include <errno.h>
 #include <sys/stat.h>
@@ -85,8 +83,6 @@
 #include <pwd.h>				// For getpwent
 #include <grp.h>
 
-#include <sys/resource.h>
-
 #ifdef HAVE_SELECT_H
 #  include <select.h>
 #endif
@@ -191,8 +187,8 @@
 /*
   Used with --help for detailed option
 */
-static bool opt_help= false;
-static bool opt_help_extended= false;
+bool opt_help= false;
+bool opt_help_extended= false;
 
 arg_cmp_func Arg_comparator::comparator_matrix[5][2] =
 {{&Arg_comparator::compare_string,     &Arg_comparator::compare_e_string},
@@ -203,12 +199,9 @@
 
 /* static variables */
 
-static bool volatile select_thread_in_use;
-static bool volatile ready_to_exit;
 static bool opt_debugging= 0;
 static uint32_t wake_thread;
-static uint32_t killed_threads;
-static char *drizzled_user, *drizzled_chroot;
+static char *drizzled_chroot;
 static char *language_ptr;
 static const char *default_character_set_name;
 static const char *character_set_filesystem_name;
@@ -219,6 +212,9 @@
 
 /* Global variables */
 
+bool volatile ready_to_exit;
+char *drizzled_user;
+bool volatile select_thread_in_use;
 bool volatile abort_loop;
 bool volatile shutdown_in_progress;
 uint32_t max_used_connections;
@@ -235,7 +231,7 @@
 
 char* opt_secure_file_priv= 0;
 
-static bool calling_initgroups= false; /**< Used in SIGSEGV handler. */
+bool calling_initgroups= false; /**< Used in SIGSEGV handler. */
 
 uint32_t drizzled_bind_timeout;
 std::bitset<12> test_flags;
@@ -294,15 +290,15 @@
 char drizzle_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30];
 char *default_tz_name;
 char glob_hostname[FN_REFLEN];
-char drizzle_real_data_home[FN_REFLEN],
+char data_home_real[FN_REFLEN],
      language[FN_REFLEN], 
      *opt_tc_log_file;
-char drizzle_unpacked_real_data_home[FN_REFLEN];
+char data_home_real_unpacked[FN_REFLEN];
 const key_map key_map_empty(0);
 key_map key_map_full(0);                        // Will be initialized later
 
-uint32_t drizzle_data_home_len;
-char drizzle_data_home_buff[2], *drizzle_data_home=drizzle_real_data_home;
+uint32_t data_home_len;
+char data_home_buff[2], *data_home=data_home_real;
 char *drizzle_tmpdir= NULL;
 char *opt_drizzle_tmpdir= NULL;
 
@@ -347,15 +343,12 @@
 
 /* Static variables */
 
-static bool segfaulted;
 int cleanup_done;
 static char *drizzle_home_ptr, *pidfile_name_ptr;
 static int defaults_argc;
 static char **defaults_argv;
 
-struct passwd *user_info;
-static pthread_t select_thread;
-static uint32_t thr_kill_signal;
+passwd *user_info;
 
 /**
   Number of currently active user connections. The variable is protected by
@@ -379,10 +372,8 @@
 static const char *get_relative_path(const char *path);
 static void fix_paths(string &progname);
 extern "C" pthread_handler_t handle_slave(void *arg);
-static void clean_up(bool print_message);
 
 static void usage(void);
-static void clean_up_mutexes(void);
 void close_connections(void);
  
 /****************************************************************************
@@ -467,20 +458,6 @@
   }
 }
 
-extern "C" void print_signal_warning(int sig);
-
-extern "C" void print_signal_warning(int sig)
-{
-  if (global_system_variables.log_warnings)
-    errmsg_printf(ERRMSG_LVL_WARN, _("Got signal %d from thread %"PRIu64),
-                  sig, global_thread_id);
-#ifndef HAVE_BSD_SIGNALS
-  my_sigset(sig,print_signal_warning);		/* int. thread system calls */
-#endif
-  if (sig == SIGALRM)
-    alarm(2);					/* reschedule alarm */
-}
-
 /**
   cleanup all memory and end program nicely.
 
@@ -517,7 +494,7 @@
 }
 
 
-static void clean_up(bool print_message)
+void clean_up(bool print_message)
 {
   if (cleanup_done++)
     return;
@@ -559,7 +536,7 @@
 } /* clean_up */
 
 
-static void clean_up_mutexes()
+void clean_up_mutexes()
 {
   (void) pthread_mutex_destroy(&LOCK_create_db);
   (void) pthread_mutex_destroy(&LOCK_open);
@@ -577,9 +554,9 @@
 
 /* Change to run as another user if started with --user */
 
-static struct passwd *check_user(const char *user)
+passwd *check_user(const char *user)
 {
-  struct passwd *tmp_user_info;
+  passwd *tmp_user_info;
   uid_t user_id= geteuid();
 
   // Don't bother if we aren't superuser
@@ -637,7 +614,7 @@
 
 }
 
-static void set_user(const char *user, struct passwd *user_info_arg)
+void set_user(const char *user, passwd *user_info_arg)
 {
   assert(user_info_arg != 0);
   /*
@@ -662,6 +639,7 @@
 }
 
 
+
 /** Change root user if started with @c --chroot . */
 static void set_root(const char *path)
 {
@@ -672,21 +650,6 @@
   }
 }
 
-extern "C" void end_thread_signal(int );
-
-/** Called when a thread is aborted. */
-extern "C" void end_thread_signal(int )
-{
-  Session *session=current_session;
-  if (session)
-  {
-    statistic_increment(killed_threads, &LOCK_status);
-    session->scheduler->killSessionNow(session);
-    DRIZZLE_CONNECTION_DONE(session->thread_id);
-  }
-  return;
-}
-
 
 /*
   Unlink session from global list of available connections and free session
@@ -734,148 +697,6 @@
 }
 #endif
 
-#if defined(BACKTRACE_DEMANGLE)
-#include <cxxabi.h>
-extern "C" char *my_demangle(const char *mangled_name, int *status)
-{
-  return abi::__cxa_demangle(mangled_name, NULL, NULL, status);
-}
-#endif
-
-extern "C" void handle_segfault(int sig);
-
-extern "C" void handle_segfault(int sig)
-{
-  time_t curr_time;
-  struct tm tm;
-
-  /*
-    Strictly speaking, one needs a mutex here
-    but since we have got SIGSEGV already, things are a mess
-    so not having the mutex is not as bad as possibly using a buggy
-    mutex - so we keep things simple
-  */
-  if (segfaulted)
-  {
-    fprintf(stderr, _("Fatal signal %d while backtracing\n"), sig);
-    exit(1);
-  }
-
-  segfaulted = 1;
-
-  curr_time= time(NULL);
-  if(curr_time == (time_t)-1)
-  {
-    fprintf(stderr, "Fetal: time() call failed\n");
-    exit(1);
-  }
-
-  localtime_r(&curr_time, &tm);
-  
-  fprintf(stderr,"%02d%02d%02d %2d:%02d:%02d - drizzled got signal %d;\n"
-          "This could be because you hit a bug. It is also possible that "
-          "this binary\n or one of the libraries it was linked against is "
-          "corrupt, improperly built,\n or misconfigured. This error can "
-          "also be caused by malfunctioning hardware.\n",
-          tm.tm_year % 100, tm.tm_mon+1, tm.tm_mday,
-          tm.tm_hour, tm.tm_min, tm.tm_sec,
-          sig);
-  fprintf(stderr, _("We will try our best to scrape up some info that "
-                    "will hopefully help diagnose\n"
-                    "the problem, but since we have already crashed, "
-                    "something is definitely wrong\nand this may fail.\n\n"));
-  fprintf(stderr, "key_buffer_size=%u\n",
-          (uint32_t) dflt_key_cache->key_cache_mem_size);
-  fprintf(stderr, "read_buffer_size=%ld\n", (long) global_system_variables.read_buff_size);
-  fprintf(stderr, "max_used_connections=%u\n", max_used_connections);
-  fprintf(stderr, "connection_count=%u\n", uint32_t(connection_count));
-  fprintf(stderr, _("It is possible that drizzled could use up to \n"
-                    "key_buffer_size + (read_buffer_size + "
-                    "sort_buffer_size)*thread_count\n"
-                    "bytes of memory\n"
-                    "Hope that's ok; if not, decrease some variables in the "
-                    "equation.\n\n"));
-
-#ifdef HAVE_STACKTRACE
-  Session *session= current_session;
-
-  if (! (test_flags.test(TEST_NO_STACKTRACE)))
-  {
-    fprintf(stderr,"session: 0x%lx\n",(long) session);
-    fprintf(stderr,_("Attempting backtrace. You can use the following "
-                     "information to find out\n"
-                     "where drizzled died. If you see no messages after this, "
-                     "something went\n"
-                     "terribly wrong...\n"));
-    print_stacktrace(session ? (unsigned char*) session->thread_stack : (unsigned char*) 0,
-                     my_thread_stack_size);
-  }
-  if (session)
-  {
-    const char *kreason= "UNKNOWN";
-    switch (session->killed) {
-    case Session::NOT_KILLED:
-      kreason= "NOT_KILLED";
-      break;
-    case Session::KILL_BAD_DATA:
-      kreason= "KILL_BAD_DATA";
-      break;
-    case Session::KILL_CONNECTION:
-      kreason= "KILL_CONNECTION";
-      break;
-    case Session::KILL_QUERY:
-      kreason= "KILL_QUERY";
-      break;
-    case Session::KILLED_NO_VALUE:
-      kreason= "KILLED_NO_VALUE";
-      break;
-    }
-    fprintf(stderr, _("Trying to get some variables.\n"
-                      "Some pointers may be invalid and cause the "
-                      "dump to abort...\n"));
-    safe_print_str("session->query", session->query.c_str(), 1024);
-    fprintf(stderr, "session->thread_id=%"PRIu32"\n", (uint32_t) session->thread_id);
-    fprintf(stderr, "session->killed=%s\n", kreason);
-  }
-  fflush(stderr);
-#endif /* HAVE_STACKTRACE */
-
-  if (calling_initgroups)
-    fprintf(stderr, _("\nThis crash occurred while the server was calling "
-                      "initgroups(). This is\n"
-                      "often due to the use of a drizzled that is statically "
-                      "linked against glibc\n"
-                      "and configured to use LDAP in /etc/nsswitch.conf. "
-                      "You will need to either\n"
-                      "upgrade to a version of glibc that does not have this "
-                      "problem (2.3.4 or\n"
-                      "later when used with nscd), disable LDAP in your "
-                      "nsswitch.conf, or use a\n"
-                      "drizzled that is not statically linked.\n"));
-
-  if (internal::thd_lib_detected == THD_LIB_LT && !getenv("LD_ASSUME_KERNEL"))
-    fprintf(stderr,
-            _("\nYou are running a statically-linked LinuxThreads binary "
-              "on an NPTL system.\n"
-              "This can result in crashes on some distributions due "
-              "to LT/NPTL conflicts.\n"
-              "You should either build a dynamically-linked binary, or force "
-              "LinuxThreads\n"
-              "to be used with the LD_ASSUME_KERNEL environment variable. "
-              "Please consult\n"
-              "the documentation for your distribution on how to do that.\n"));
-
-#ifdef HAVE_WRITE_CORE
-  if (test_flags.test(TEST_CORE_ON_SIGNAL))
-  {
-    fprintf(stderr, _("Writing a core file\n"));
-    fflush(stderr);
-    write_core(sig);
-  }
-#endif
-
-  exit(1);
-}
 
 #ifndef SA_RESETHAND
 #define SA_RESETHAND 0
@@ -885,65 +706,12 @@
 #endif
 
 
-/**
-  All global error messages are sent here where the first one is stored
-  for the client.
-*/
-static void my_message_sql(uint32_t error, const char *str, myf MyFlags)
+
+
+const char *load_default_groups[]= 
 {
-  Session *session;
-  /*
-    Put here following assertion when situation with EE_* error codes
-    will be fixed
-  */
-  if ((session= current_session))
-  {
-    if (MyFlags & ME_FATALERROR)
-      session->is_fatal_error= 1;
-
-    /*
-      TODO: There are two exceptions mechanism (Session and sp_rcontext),
-      this could be improved by having a common stack of handlers.
-    */
-    if (session->handle_error(error, str,
-                          DRIZZLE_ERROR::WARN_LEVEL_ERROR))
-      return;;
-
-    /*
-      session->lex->current_select == 0 if lex structure is not inited
-      (not query command (COM_QUERY))
-    */
-    if (! (session->lex->current_select &&
-        session->lex->current_select->no_error && !session->is_fatal_error))
-    {
-      if (! session->main_da.is_error())            // Return only first message
-      {
-        if (error == 0)
-          error= ER_UNKNOWN_ERROR;
-        if (str == NULL)
-          str= ER(error);
-        session->main_da.set_error_status(error, str);
-      }
-    }
-
-    if (!session->no_warnings_for_error && !session->is_fatal_error)
-    {
-      /*
-        Suppress infinite recursion if there a memory allocation error
-        inside push_warning.
-      */
-      session->no_warnings_for_error= true;
-      push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_ERROR, error, str);
-      session->no_warnings_for_error= false;
-    }
-  }
-  if (!session || MyFlags & ME_NOREFRESH)
-    errmsg_printf(ERRMSG_LVL_ERROR, "%s: %s",internal::my_progname,str);
-}
-
-
-static const char *load_default_groups[]= {
-DRIZZLE_CONFIG_NAME, "server", 0, 0};
+  DRIZZLE_CONFIG_NAME, "server", 0, 0
+};
 
 static int show_starttime(drizzle_show_var *var, char *buff)
 {
@@ -1061,8 +829,8 @@
   {NULL, NULL, SHOW_LONGLONG}
 };
 
-static int init_common_variables(const char *conf_file_name, int argc,
-                                 char **argv, const char **groups)
+int init_common_variables(const char *conf_file_name, int argc,
+                          char **argv, const char **groups)
 {
   time_t curr_time;
   umask(((~internal::my_umask) & 0666));
@@ -1211,7 +979,7 @@
 }
 
 
-static int init_server_components(plugin::Registry &plugins)
+int init_server_components(plugin::Registry &plugins)
 {
   /*
     We need to call each of these following functions to ensure that
@@ -1446,8 +1214,8 @@
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"datadir", 'h',
    N_("Path to the database root."),
-   (char**) &drizzle_data_home,
-   (char**) &drizzle_data_home, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   (char**) &data_home,
+   (char**) &data_home, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"default-storage-engine", OPT_STORAGE_ENGINE,
    N_("Set the default storage engine (table type) for tables."),
    (char**)&default_storage_engine_str, (char**)&default_storage_engine_str,
@@ -1793,7 +1561,6 @@
   drizzle_home[0]= pidfile_name[0]= 0;
   opt_tc_log_file= (char *)"tc.log";      // no hostname in tc_log file name !
   opt_secure_file_priv= 0;
-  segfaulted= 0;
   cleanup_done= 0;
   defaults_argc= 0;
   defaults_argv= 0;
@@ -1818,7 +1585,7 @@
   drizzle_home_ptr= drizzle_home;
   pidfile_name_ptr= pidfile_name;
   language_ptr= language;
-  drizzle_data_home= drizzle_real_data_home;
+  data_home= data_home_real;
   session_startup_options= (OPTION_AUTO_IS_NULL | OPTION_SQL_NOTES);
   refresh_version= 1L;	/* Increments on each reload */
   global_thread_id= 1UL;
@@ -1826,11 +1593,11 @@
 
   /* Set directory paths */
   strncpy(language, LANGUAGE, sizeof(language)-1);
-  strncpy(drizzle_real_data_home, get_relative_path(LOCALSTATEDIR),
-          sizeof(drizzle_real_data_home)-1);
-  drizzle_data_home_buff[0]=FN_CURLIB;	// all paths are relative from here
-  drizzle_data_home_buff[1]=0;
-  drizzle_data_home_len= 2;
+  strncpy(data_home_real, get_relative_path(LOCALSTATEDIR),
+          sizeof(data_home_real)-1);
+  data_home_buff[0]=FN_CURLIB;	// all paths are relative from here
+  data_home_buff[1]=0;
+  data_home_len= 2;
 
   /* Variables in libraries */
   default_character_set_name= "utf8";
@@ -1877,10 +1644,10 @@
       default_collation_name= 0;
     break;
   case 'h':
-    strncpy(drizzle_real_data_home,argument, sizeof(drizzle_real_data_home)-1);
+    strncpy(data_home_real,argument, sizeof(data_home_real)-1);
     /* Correct pointer set by my_getopt (for embedded library) */
-    drizzle_data_home= drizzle_real_data_home;
-    drizzle_data_home_len= strlen(drizzle_data_home);
+    data_home= data_home_real;
+    data_home_len= strlen(data_home);
     break;
   case 'u':
     if (!drizzled_user || !strcmp(drizzled_user, argument))
@@ -2065,14 +1832,14 @@
     pos[0]= FN_LIBCHAR;
     pos[1]= 0;
   }
-  internal::convert_dirname(drizzle_real_data_home,drizzle_real_data_home,NULL);
-  (void) internal::fn_format(buff, drizzle_real_data_home, "", "",
+  internal::convert_dirname(data_home_real,data_home_real,NULL);
+  (void) internal::fn_format(buff, data_home_real, "", "",
                    (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS));
-  (void) internal::unpack_dirname(drizzle_unpacked_real_data_home, buff);
+  (void) internal::unpack_dirname(data_home_real_unpacked, buff);
   internal::convert_dirname(language,language,NULL);
   (void) internal::my_load_path(drizzle_home, drizzle_home,""); // Resolve current dir
-  (void) internal::my_load_path(drizzle_real_data_home, drizzle_real_data_home,drizzle_home);
-  (void) internal::my_load_path(pidfile_name, pidfile_name,drizzle_real_data_home);
+  (void) internal::my_load_path(data_home_real, data_home_real,drizzle_home);
+  (void) internal::my_load_path(pidfile_name, pidfile_name,data_home_real);
 
   if (opt_plugin_dir_ptr == NULL)
   {
@@ -2100,11 +1867,11 @@
       progdir.assign(progdir.substr(0, progdir.rfind(".libs/")));
     }
     string testfile(progdir);
-    testfile.append("drizzled.o");
+    testfile.append("drizzled.lo");
     struct stat testfile_stat;
     if (stat(testfile.c_str(), &testfile_stat))
     {
-      /* drizzled.o doesn't exist - we are not in a source dir.
+      /* drizzled.lo doesn't exist - we are not in a source dir.
        * Go on as usual
        */
       (void) internal::my_load_path(opt_plugin_dir, get_relative_path(PKGPLUGINDIR),
@@ -2173,209 +1940,3 @@
 
 } /* namespace drizzled */
 
-using namespace drizzled;
-
-
-static void init_signals(void)
-{
-  sigset_t set;
-  struct sigaction sa;
-
-  if (!(test_flags.test(TEST_NO_STACKTRACE) || 
-        test_flags.test(TEST_CORE_ON_SIGNAL)))
-  {
-    sa.sa_flags = SA_RESETHAND | SA_NODEFER;
-    sigemptyset(&sa.sa_mask);
-    sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL);
-
-    init_stacktrace();
-    sa.sa_handler=handle_segfault;
-    sigaction(SIGSEGV, &sa, NULL);
-    sigaction(SIGABRT, &sa, NULL);
-#ifdef SIGBUS
-    sigaction(SIGBUS, &sa, NULL);
-#endif
-    sigaction(SIGILL, &sa, NULL);
-    sigaction(SIGFPE, &sa, NULL);
-  }
-
-  if (test_flags.test(TEST_CORE_ON_SIGNAL))
-  {
-    /* Change limits so that we will get a core file */
-    struct rlimit rl;
-    rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
-    if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings)
-        errmsg_printf(ERRMSG_LVL_WARN,
-                      _("setrlimit could not change the size of core files "
-                        "to 'infinity';  We may not be able to generate a "
-                        "core file on signals"));
-  }
-  (void) sigemptyset(&set);
-  my_sigset(SIGPIPE,SIG_IGN);
-  sigaddset(&set,SIGPIPE);
-#ifndef IGNORE_SIGHUP_SIGQUIT
-  sigaddset(&set,SIGQUIT);
-  sigaddset(&set,SIGHUP);
-#endif
-  sigaddset(&set,SIGTERM);
-
-  /* Fix signals if blocked by parents (can happen on Mac OS X) */
-  sigemptyset(&sa.sa_mask);
-  sa.sa_flags = 0;
-  sa.sa_handler = print_signal_warning;
-  sigaction(SIGTERM, &sa, (struct sigaction*) 0);
-  sa.sa_flags = 0;
-  sa.sa_handler = print_signal_warning;
-  sigaction(SIGHUP, &sa, (struct sigaction*) 0);
-#ifdef SIGTSTP
-  sigaddset(&set,SIGTSTP);
-#endif
-  if (test_flags.test(TEST_SIGINT))
-  {
-    my_sigset(thr_kill_signal, end_thread_signal);
-    // May be SIGINT
-    sigdelset(&set, thr_kill_signal);
-  }
-  else
-    sigaddset(&set,SIGINT);
-  sigprocmask(SIG_SETMASK,&set,NULL);
-  pthread_sigmask(SIG_SETMASK,&set,NULL);
-  return;;
-}
-
-int main(int argc, char **argv)
-{
-#if defined(ENABLE_NLS)
-# if defined(HAVE_LOCALE_H)
-  setlocale(LC_ALL, "");
-# endif
-  bindtextdomain("drizzle", LOCALEDIR);
-  textdomain("drizzle");
-#endif
-
-  plugin::Registry &plugins= plugin::Registry::singleton();
-  plugin::Client *client;
-  Session *session;
-
-  MY_INIT(argv[0]);		// init my_sys library & pthreads
-  /* nothing should come before this line ^^^ */
-
-  /* Set signal used to kill Drizzle */
-#if defined(SIGUSR2)
-  thr_kill_signal= internal::thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
-#else
-  thr_kill_signal= SIGINT;
-#endif
-
-  if (init_common_variables(DRIZZLE_CONFIG_NAME,
-			    argc, argv, load_default_groups))
-    unireg_abort(1);				// Will do exit
-
-  init_signals();
-
-
-  select_thread=pthread_self();
-  select_thread_in_use=1;
-
-  if (chdir(drizzle_real_data_home) && !opt_help)
-  {
-    errmsg_printf(ERRMSG_LVL_ERROR, _("Data directory %s does not exist\n"), drizzle_real_data_home);
-    unireg_abort(1);
-  }
-  drizzle_data_home= drizzle_data_home_buff;
-  drizzle_data_home[0]=FN_CURLIB;		// all paths are relative from here
-  drizzle_data_home[1]=0;
-  drizzle_data_home_len= 2;
-
-  if ((user_info= check_user(drizzled_user)))
-  {
-    set_user(drizzled_user, user_info);
-  }
-
-  if (server_id == 0)
-  {
-    server_id= 1;
-  }
-
-  if (init_server_components(plugins))
-    unireg_abort(1);
-
-  /**
-   * This check must be done after init_server_components for now
-   * because we don't yet have plugin dependency tracking...
-   *
-   * ReplicationServices::evaluateRegisteredPlugins() will print error messages to stderr
-   * via errmsg_printf().
-   *
-   * @todo
-   *
-   * not checking return since unireg_abort() hangs
-   */
-  ReplicationServices &replication_services= ReplicationServices::singleton();
-  (void) replication_services.evaluateRegisteredPlugins();
-
-  if (plugin::Listen::setup())
-    unireg_abort(1);
-
-  /*
-    init signals & alarm
-    After this we can't quit by a simple unireg_abort
-  */
-  error_handler_hook= my_message_sql;
-
-  assert(plugin::num_trx_monitored_objects > 0);
-  if (drizzle_rm_tmp_tables() ||
-      my_tz_init((Session *)0, default_tz_name))
-  {
-    abort_loop= true;
-    select_thread_in_use=0;
-    (void) pthread_kill(signal_thread, SIGTERM);
-
-    (void) unlink(pidfile_name);	// Not needed anymore
-
-    exit(1);
-  }
-
-  init_status_vars();
-
-  errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_STARTUP)), internal::my_progname,
-                PANDORA_RELEASE_VERSION, COMPILATION_COMMENT);
-
-
-  /* Listen for new connections and start new session for each connection
-     accepted. The listen.getClient() method will return NULL when the server
-     should be shutdown. */
-  while ((client= plugin::Listen::getClient()) != NULL)
-  {
-    if (!(session= new Session(client)))
-    {
-      delete client;
-      continue;
-    }
-
-    /* If we error on creation we drop the connection and delete the session. */
-    if (session->schedule())
-      Session::unlink(session);
-  }
-
-  /* (void) pthread_attr_destroy(&connection_attrib); */
-
-
-  (void) pthread_mutex_lock(&LOCK_thread_count);
-  select_thread_in_use=0;			// For close_connections
-  (void) pthread_mutex_unlock(&LOCK_thread_count);
-  (void) pthread_cond_broadcast(&COND_thread_count);
-
-  /* Wait until cleanup is done */
-  (void) pthread_mutex_lock(&LOCK_thread_count);
-  while (!ready_to_exit)
-    pthread_cond_wait(&COND_server_end,&LOCK_thread_count);
-  (void) pthread_mutex_unlock(&LOCK_thread_count);
-
-  clean_up(1);
-  plugin::Registry::shutdown();
-  clean_up_mutexes();
-  internal::my_end();
-  return 0;
-}
-

=== added file 'drizzled/drizzled.h'
--- drizzled/drizzled.h	1970-01-01 00:00:00 +0000
+++ drizzled/drizzled.h	2010-04-19 20:33:26 +0000
@@ -0,0 +1,65 @@
+/* -*- 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 Monty Taylor
+ *
+ *  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_DRIZZLED_H
+#define DRIZZLED_DRIZZLED_H
+
+#include <bitset>
+
+#include "drizzled/atomics.h"
+
+struct passwd;
+
+namespace drizzled
+{
+
+namespace plugin
+{
+class Registry;
+}
+
+extern std::bitset<12> test_flags;
+extern uint32_t max_used_connections;
+extern atomic<uint32_t> connection_count;
+extern bool calling_initgroups;
+extern const char *load_default_groups[];
+extern bool volatile select_thread_in_use;
+extern bool volatile abort_loop;
+extern bool volatile ready_to_exit;
+extern bool opt_help;
+extern bool opt_help_extended;
+extern passwd *user_info;
+extern char *drizzled_user;
+
+extern const char * const DRIZZLE_CONFIG_NAME;
+
+int init_server_components(plugin::Registry &plugins);
+int init_common_variables(const char *conf_file_name, int argc,
+                          char **argv, const char **groups);
+
+passwd *check_user(const char *user);
+void set_user(const char *user, passwd *user_info_arg);
+void clean_up(bool print_message);
+void clean_up_mutexes(void);
+bool drizzle_rm_tmp_tables();
+
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_DRIZZLED_H */

=== modified file 'drizzled/function/str/load_file.cc'
--- drizzled/function/str/load_file.cc	2010-02-04 08:14:46 +0000
+++ drizzled/function/str/load_file.cc	2010-04-19 20:33:26 +0000
@@ -42,7 +42,7 @@
   if (!(file_name= args[0]->val_str(str)))
     goto err;
 
-  (void) internal::fn_format(path, file_name->c_ptr(), drizzle_real_data_home, "",
+  (void) internal::fn_format(path, file_name->c_ptr(), data_home_real, "",
 		   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
 
   /* Read only allowed from within dir specified by secure_file_priv */

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2010-04-14 21:40:03 +0000
+++ drizzled/include.am	2010-04-19 20:33:26 +0000
@@ -18,8 +18,6 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-sbin_PROGRAMS= drizzled/drizzled
-
 DTRACEFILES= \
 	     drizzled/cursor.o \
 	     drizzled/drizzled.o \
@@ -54,12 +52,15 @@
 			      drizzled/comp_creator.h \
 			      drizzled/create_field.h \
 			      drizzled/current_session.h \
+			      drizzled/cursor.h \
 			      drizzled/data_home.h \
 			      drizzled/db.h \
 			      drizzled/decimal.h \
 			      drizzled/definitions.h \
 			      drizzled/diagnostics_area.h \
 			      drizzled/discrete_interval.h \
+			      drizzled/drizzle_time.h \
+			      drizzled/drizzled.h \
 			      drizzled/dtcollation.h \
 			      drizzled/dynamic_array.h \
 			      drizzled/enum.h \
@@ -184,14 +185,12 @@
 			      drizzled/function/time/unix_timestamp.h \
 			      drizzled/function/time/weekday.h \
 			      drizzled/function/time/year.h  \
-			      drizzled/typelib.h \
 			      drizzled/function/units.h \
 			      drizzled/function/user_var_as_out_param.h \
 			      drizzled/function_hash.h \
 			      drizzled/gettext.h \
 			      drizzled/global_charset_info.h \
 			      drizzled/ha_statistics.h \
-			      drizzled/cursor.h \
 			      drizzled/handler_structs.h \
 			      drizzled/hybrid_type.h \
 			      drizzled/hybrid_type_traits.h \
@@ -200,7 +199,6 @@
 			      drizzled/index_hint.h \
 			      drizzled/internal_error_handler.h \
 			      drizzled/item.h \
-			      drizzled/item_result.h \
 			      drizzled/item/basic_constant.h \
 			      drizzled/item/bin_string.h \
 			      drizzled/item/blob.h \
@@ -238,6 +236,7 @@
 			      drizzled/item/sum.h \
 			      drizzled/item/type_holder.h \
 			      drizzled/item/uint.h \
+			      drizzled/item_result.h \
 			      drizzled/join.h \
 			      drizzled/join_cache.h \
 			      drizzled/join_table.h \
@@ -251,24 +250,20 @@
 			      drizzled/lex_symbol.h \
 			      drizzled/lock.h \
 			      drizzled/lookup_symbol.h \
-			      drizzled/memory/sql_alloc.h \
 			      drizzled/memory/multi_malloc.h \
 			      drizzled/memory/root.h \
-			      drizzled/option.h \
+			      drizzled/memory/sql_alloc.h \
 			      drizzled/my_hash.h \
-			      drizzled/drizzle_time.h \
-			      drizzled/tree.h \
-			      drizzled/var.h \
 			      drizzled/name_resolution_context.h \
 			      drizzled/name_resolution_context_state.h \
 			      drizzled/named_savepoint.h \
 			      drizzled/natural_join_column.h \
 			      drizzled/nested_join.h \
 			      drizzled/open_tables_state.h \
-                              drizzled/optimizer/cost_vector.h \
+			      drizzled/optimizer/cost_vector.h \
+			      drizzled/optimizer/explain_plan.h \
 			      drizzled/optimizer/key_field.h \
 			      drizzled/optimizer/key_use.h \
-			      drizzled/optimizer/explain_plan.h \
 			      drizzled/optimizer/position.h \
 			      drizzled/optimizer/quick_group_min_max_select.h \
 			      drizzled/optimizer/quick_index_merge_select.h \
@@ -284,6 +279,7 @@
 			      drizzled/optimizer/sel_tree.h \
 			      drizzled/optimizer/sum.h \
 			      drizzled/optimizer/table_read_plan.h \
+			      drizzled/option.h \
 			      drizzled/order.h \
 			      drizzled/parser.h \
 			      drizzled/plugin.h \
@@ -304,9 +300,9 @@
 			      drizzled/plugin/null_client.h \
 			      drizzled/plugin/plugin.h \
 			      drizzled/plugin/query_cache.h \
-		              drizzled/plugin/query_rewrite.h \
+			      drizzled/plugin/query_rewrite.h \
+			      drizzled/plugin/replication.h \
 			      drizzled/plugin/registry.h \
-			      drizzled/plugin/replication.h \
 			      drizzled/plugin/scheduler.h \
 			      drizzled/plugin/storage_engine.h \
 			      drizzled/plugin/table_function.h \
@@ -314,11 +310,11 @@
 			      drizzled/plugin/transaction_reader.h \
 			      drizzled/plugin/transaction_replicator.h \
 			      drizzled/plugin/transactional_storage_engine.h \
+			      drizzled/plugin/version.h \
+			      drizzled/plugin/xa_resource_manager.h \
 			      drizzled/plugin/xa_storage_engine.h \
-			      drizzled/plugin/xa_resource_manager.h \
-			      drizzled/plugin/version.h \
+			      drizzled/probes.h \
 			      drizzled/pthread_globals.h \
-			      drizzled/probes.h \
 			      drizzled/qsort_cmp.h \
 			      drizzled/query_id.h \
 			      drizzled/records.h \
@@ -344,6 +340,7 @@
 			      drizzled/session_list.h \
 			      drizzled/set_var.h \
 			      drizzled/show.h \
+			      drizzled/signal_handler.h \
 			      drizzled/sql_base.h \
 			      drizzled/sql_bitmap.h \
 			      drizzled/sql_error.h \
@@ -414,8 +411,10 @@
 			      drizzled/thr_lock.h \
 			      drizzled/time_functions.h \
 			      drizzled/tmp_table_param.h \
+			      drizzled/transaction_context.h \
 			      drizzled/transaction_services.h \
-			      drizzled/transaction_context.h \
+			      drizzled/tree.h \
+			      drizzled/typelib.h \
 			      drizzled/tzfile.h \
 			      drizzled/tztime.h \
 			      drizzled/unique.h \
@@ -427,337 +426,350 @@
 			      drizzled/utf8/checked.h \
 			      drizzled/utf8/core.h \
 			      drizzled/utf8/unchecked.h \
+			      drizzled/var.h \
 			      drizzled/version.h \
 			      drizzled/visibility.h \
 			      drizzled/xid.h
 
-DRIZZLED_LDADD= \
-		drizzled/internal/libinternal.la \
-		$(LIBZ) \
-		$(LIBINTL) \
-		${LIBC_P}
-
+lib_LTLIBRARIES+= drizzled/libdrizzled.la
+drizzled_libdrizzled_la_LIBADD= \
+				drizzled/algorithm/libhash.la \
+				drizzled/util/libutil.la \
+				drizzled/internal/libinternal.la \
+				drizzled/message/libdrizzledmessage.la \
+				gnulib/libgnu.la \
+				$(LIBZ) \
+				$(LIBINTL) \
+				${LIBC_P} \
+				$(pandora_plugin_libs) \
+				$(LDADD) \
+				$(LIBUUID) \
+				$(LIBDL_LIBS) \
+				$(LIBPROTOBUF) \
+				$(LIBPCRE) \
+				$(LIBTBB) \
+				$(GCOV_LIBS) 
+
+drizzled_libdrizzled_la_DEPENDENCIES= \
+                                      drizzled/message/libdrizzledmessage.la \
+                                      ${noinst_LTLIBRARIES} \
+                                      $(pandora_plugin_libs)
+
+drizzled_libdrizzled_la_SOURCES= \
+				 drizzled/alter_info.cc \
+				 drizzled/cached_item.cc \
+				 drizzled/calendar.cc \
+				 drizzled/check_stack_overrun.cc \
+				 drizzled/comp_creator.cc \
+				 drizzled/create_field.cc \
+				 drizzled/current_session.cc \
+				 drizzled/cursor.cc \
+				 drizzled/decimal.cc \
+				 drizzled/diagnostics_area.cc \
+				 drizzled/drizzle_time.cc \
+				 drizzled/drizzled.cc \
+				 drizzled/dtcollation.cc \
+				 drizzled/errmsg_print.cc \
+				 drizzled/field.cc \
+				 drizzled/field/blob.cc \
+				 drizzled/field/date.cc \
+				 drizzled/field/datetime.cc \
+				 drizzled/field/decimal.cc \
+				 drizzled/field/double.cc \
+				 drizzled/field/enum.cc \
+				 drizzled/field/int64_t.cc \
+				 drizzled/field/long.cc \
+				 drizzled/field/null.cc \
+				 drizzled/field/num.cc \
+				 drizzled/field/real.cc \
+				 drizzled/field/str.cc \
+				 drizzled/field/timestamp.cc \
+				 drizzled/field/varstring.cc \
+				 drizzled/field_conv.cc \
+				 drizzled/field_iterator.cc \
+				 drizzled/file_exchange.cc \
+				 drizzled/filesort.cc \
+				 drizzled/foreign_key.cc \
+				 drizzled/function/additive_op.cc \
+				 drizzled/function/coercibility.cc \
+				 drizzled/function/field.cc \
+				 drizzled/function/find_in_set.cc \
+				 drizzled/function/found_rows.cc \
+				 drizzled/function/func.cc \
+				 drizzled/function/get_system_var.cc \
+				 drizzled/function/get_user_var.cc \
+				 drizzled/function/last_insert.cc \
+				 drizzled/function/locate.cc \
+				 drizzled/function/math/abs.cc \
+				 drizzled/function/math/acos.cc \
+				 drizzled/function/math/asin.cc \
+				 drizzled/function/math/atan.cc \
+				 drizzled/function/math/ceiling.cc \
+				 drizzled/function/math/cos.cc \
+				 drizzled/function/math/decimal_typecast.cc \
+				 drizzled/function/math/divide.cc \
+				 drizzled/function/math/exp.cc \
+				 drizzled/function/math/floor.cc \
+				 drizzled/function/math/int.cc \
+				 drizzled/function/math/int_divide.cc \
+				 drizzled/function/math/int_val.cc \
+				 drizzled/function/math/integer.cc \
+				 drizzled/function/math/ln.cc \
+				 drizzled/function/math/log.cc \
+				 drizzled/function/math/minus.cc \
+				 drizzled/function/math/mod.cc \
+				 drizzled/function/math/multiply.cc \
+				 drizzled/function/math/neg.cc \
+				 drizzled/function/math/ord.cc \
+				 drizzled/function/math/plus.cc \
+				 drizzled/function/math/pow.cc \
+				 drizzled/function/math/rand.cc \
+				 drizzled/function/math/real.cc \
+				 drizzled/function/math/round.cc \
+				 drizzled/function/math/sin.cc \
+				 drizzled/function/math/sqrt.cc \
+				 drizzled/function/math/tan.cc \
+				 drizzled/function/min_max.cc \
+				 drizzled/function/num1.cc \
+				 drizzled/function/num_op.cc \
+				 drizzled/function/numhybrid.cc \
+				 drizzled/function/row_count.cc \
+				 drizzled/function/set_user_var.cc \
+				 drizzled/function/sign.cc \
+				 drizzled/function/str/alloc_buffer.cc \
+				 drizzled/function/str/binary.cc \
+				 drizzled/function/str/char.cc \
+				 drizzled/function/str/collation.cc \
+				 drizzled/function/str/concat.cc \
+				 drizzled/function/str/conv.cc \
+				 drizzled/function/str/conv_charset.cc \
+				 drizzled/function/str/elt.cc \
+				 drizzled/function/str/export_set.cc \
+				 drizzled/function/str/format.cc \
+				 drizzled/function/str/insert.cc \
+				 drizzled/function/str/left.cc \
+				 drizzled/function/str/load_file.cc \
+				 drizzled/function/str/make_set.cc \
+				 drizzled/function/str/pad.cc \
+				 drizzled/function/str/quote.cc \
+				 drizzled/function/str/repeat.cc \
+				 drizzled/function/str/replace.cc \
+				 drizzled/function/str/right.cc \
+				 drizzled/function/str/set_collation.cc \
+				 drizzled/function/str/str_conv.cc \
+				 drizzled/function/str/strfunc.cc \
+				 drizzled/function/str/trim.cc \
+				 drizzled/function/time/curdate.cc \
+				 drizzled/function/time/date.cc \
+				 drizzled/function/time/date_add_interval.cc \
+				 drizzled/function/time/date_format.cc \
+				 drizzled/function/time/dayname.cc \
+				 drizzled/function/time/dayofmonth.cc \
+				 drizzled/function/time/dayofyear.cc \
+				 drizzled/function/time/extract.cc \
+				 drizzled/function/time/from_days.cc \
+				 drizzled/function/time/from_unixtime.cc \
+				 drizzled/function/time/hour.cc \
+				 drizzled/function/time/last_day.cc \
+				 drizzled/function/time/makedate.cc \
+				 drizzled/function/time/microsecond.cc \
+				 drizzled/function/time/minute.cc \
+				 drizzled/function/time/month.cc \
+				 drizzled/function/time/now.cc \
+				 drizzled/function/time/period_add.cc \
+				 drizzled/function/time/period_diff.cc \
+				 drizzled/function/time/quarter.cc \
+				 drizzled/function/time/second.cc \
+				 drizzled/function/time/sysdate_local.cc \
+				 drizzled/function/time/timestamp_diff.cc \
+				 drizzled/function/time/to_days.cc \
+				 drizzled/function/time/typecast.cc \
+				 drizzled/function/time/unix_timestamp.cc \
+				 drizzled/function/time/weekday.cc \
+				 drizzled/function/time/year.cc \
+				 drizzled/function/units.cc \
+				 drizzled/function/user_var_as_out_param.cc \
+				 drizzled/ha_commands.cc \
+				 drizzled/hybrid_type_traits.cc \
+				 drizzled/hybrid_type_traits_decimal.cc \
+				 drizzled/hybrid_type_traits_integer.cc \
+				 drizzled/index_hint.cc \
+				 drizzled/item.cc \
+				 drizzled/item/bin_string.cc \
+				 drizzled/item/cache.cc \
+				 drizzled/item/cache_decimal.cc \
+				 drizzled/item/cache_int.cc \
+				 drizzled/item/cache_real.cc \
+				 drizzled/item/cache_row.cc \
+				 drizzled/item/cache_str.cc \
+				 drizzled/item/cmpfunc.cc \
+				 drizzled/item/copy_string.cc \
+				 drizzled/item/create.cc \
+				 drizzled/item/decimal.cc \
+				 drizzled/item/default_value.cc \
+				 drizzled/item/direct_ref.cc \
+				 drizzled/item/empty_string.cc \
+				 drizzled/item/field.cc \
+				 drizzled/item/float.cc \
+				 drizzled/item/hex_string.cc \
+				 drizzled/item/ident.cc \
+				 drizzled/item/insert_value.cc \
+				 drizzled/item/int.cc \
+				 drizzled/item/int_with_ref.cc \
+				 drizzled/item/null.cc \
+				 drizzled/item/num.cc \
+				 drizzled/item/outer_ref.cc \
+				 drizzled/item/ref.cc \
+				 drizzled/item/ref_null_helper.cc \
+				 drizzled/item/row.cc \
+				 drizzled/item/string.cc \
+				 drizzled/item/subselect.cc \
+				 drizzled/item/sum.cc \
+				 drizzled/item/type_holder.cc \
+				 drizzled/item/uint.cc \
+				 drizzled/join.cc \
+				 drizzled/join_cache.cc \
+				 drizzled/join_table.cc \
+				 drizzled/key.cc \
+				 drizzled/key_map.cc \
+				 drizzled/lock.cc \
+				 drizzled/lookup_symbol.cc \
+				 drizzled/my_getsystime.cc \
+				 drizzled/my_hash.cc \
+				 drizzled/name_resolution_context_state.cc \
+				 drizzled/natural_join_column.cc \
+				 drizzled/optimizer/explain_plan.cc \
+				 drizzled/optimizer/key_field.cc \
+				 drizzled/optimizer/quick_group_min_max_select.cc \
+				 drizzled/optimizer/quick_index_merge_select.cc \
+				 drizzled/optimizer/quick_range.cc \
+				 drizzled/optimizer/quick_range_select.cc \
+				 drizzled/optimizer/quick_ror_intersect_select.cc \
+				 drizzled/optimizer/quick_ror_union_select.cc \
+				 drizzled/optimizer/range.cc \
+				 drizzled/optimizer/sel_arg.cc \
+				 drizzled/optimizer/sel_imerge.cc \
+				 drizzled/optimizer/sel_tree.cc \
+				 drizzled/optimizer/sum.cc \
+				 drizzled/plugin/authentication.cc \
+				 drizzled/plugin/authorization.cc \
+				 drizzled/plugin/client.cc \
+				 drizzled/plugin/error_message.cc \
+				 drizzled/plugin/function.cc \
+				 drizzled/plugin/library.cc \
+				 drizzled/plugin/listen.cc \
+				 drizzled/plugin/listen_tcp.cc \
+				 drizzled/plugin/loader.cc \
+				 drizzled/plugin/logging.cc \
+				 drizzled/plugin/monitored_in_transaction.cc \
+				 drizzled/plugin/plugin.cc \
+				 drizzled/plugin/query_cache.cc \
+				 drizzled/plugin/query_rewrite.cc \
+				 drizzled/plugin/registry.cc \
+				 drizzled/plugin/scheduler.cc \
+				 drizzled/plugin/schema_engine.cc \
+				 drizzled/plugin/storage_engine.cc \
+				 drizzled/plugin/table_function.cc \
+				 drizzled/plugin/transaction_applier.cc \
+				 drizzled/plugin/transaction_replicator.cc \
+				 drizzled/plugin/transactional_storage_engine.cc \
+				 drizzled/plugin/xa_resource_manager.cc \
+				 drizzled/plugin/xa_storage_engine.cc \
+				 drizzled/query_id.cc \
+				 drizzled/records.cc \
+				 drizzled/replication_services.cc \
+				 drizzled/resource_context.cc \
+				 drizzled/schema_identifier.cc \
+				 drizzled/session.cc \
+				 drizzled/session_list.cc \
+				 drizzled/set_var.cc \
+				 drizzled/show.cc \
+				 drizzled/signal_handler.cc \
+				 drizzled/sql_base.cc \
+				 drizzled/sql_bitmap.cc \
+				 drizzled/sql_delete.cc \
+				 drizzled/sql_derived.cc \
+				 drizzled/sql_error.cc \
+				 drizzled/sql_insert.cc \
+				 drizzled/sql_lex.cc \
+				 drizzled/sql_list.cc \
+				 drizzled/sql_load.cc \
+				 drizzled/sql_locale.cc \
+				 drizzled/sql_parse.cc \
+				 drizzled/sql_select.cc \
+				 drizzled/sql_state.cc \
+				 drizzled/sql_string.cc \
+				 drizzled/sql_table.cc \
+				 drizzled/sql_union.cc \
+				 drizzled/sql_update.cc \
+				 drizzled/sql_yacc.yy \
+				 drizzled/stacktrace.cc \
+				 drizzled/statement/alter_schema.cc \
+				 drizzled/statement/alter_table.cc \
+				 drizzled/statement/analyze.cc \
+				 drizzled/statement/change_schema.cc \
+				 drizzled/statement/check.cc \
+				 drizzled/statement/commit.cc \
+				 drizzled/statement/create_index.cc \
+				 drizzled/statement/create_schema.cc \
+				 drizzled/statement/create_table.cc \
+				 drizzled/statement/delete.cc \
+				 drizzled/statement/drop_index.cc \
+				 drizzled/statement/drop_schema.cc \
+				 drizzled/statement/drop_table.cc \
+				 drizzled/statement/empty_query.cc \
+				 drizzled/statement/flush.cc \
+				 drizzled/statement/insert.cc \
+				 drizzled/statement/insert_select.cc \
+				 drizzled/statement/kill.cc \
+				 drizzled/statement/load.cc \
+				 drizzled/statement/release_savepoint.cc \
+				 drizzled/statement/rename_table.cc \
+				 drizzled/statement/replace.cc \
+				 drizzled/statement/replace_select.cc \
+				 drizzled/statement/rollback.cc \
+				 drizzled/statement/rollback_to_savepoint.cc \
+				 drizzled/statement/savepoint.cc \
+				 drizzled/statement/select.cc \
+				 drizzled/statement/set_option.cc \
+				 drizzled/statement/show_create.cc \
+				 drizzled/statement/show_create_schema.cc \
+				 drizzled/statement/show_errors.cc \
+				 drizzled/statement/show_warnings.cc \
+				 drizzled/statement/start_transaction.cc \
+				 drizzled/statement/truncate.cc \
+				 drizzled/statement/unlock_tables.cc \
+				 drizzled/statement/update.cc \
+				 drizzled/strfunc.cc \
+				 drizzled/table.cc \
+				 drizzled/table_function_container.cc \
+				 drizzled/table_identifier.cc \
+				 drizzled/table_list.cc \
+				 drizzled/table_share.cc \
+				 drizzled/temporal.cc \
+				 drizzled/temporal_format.cc \
+				 drizzled/temporal_interval.cc \
+				 drizzled/thr_lock.cc \
+				 drizzled/time_functions.cc \
+				 drizzled/transaction_services.cc \
+				 drizzled/tree.cc \
+				 drizzled/tztime.cc \
+				 drizzled/uniques.cc \
+				 drizzled/user_var_entry.cc \
+				 drizzled/version.cc \
+				 drizzled/xid.cc
+
+sbin_PROGRAMS+= drizzled/drizzled
+
+drizzled_drizzled_SOURCES= \
+                           drizzled/main.cc
 drizzled_drizzled_LDADD= \
-			 ${DRIZZLED_LDADD} \
-			 ${noinst_LTLIBRARIES} \
-			 drizzled/algorithm/libhash.la \
-			 drizzled/util/libutil.la \
-			 drizzled/message/libdrizzledmessage.la \
-			 drizzled/libcached_directory.la \
-			 drizzled/liberror.la \
-			 drizzled/libmemory.la \
-			 $(pandora_plugin_libs) \
-			 $(LDADD) $(LIBUUID) gnulib/libgnu.la \
-			 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
-			 $(PANDORA_PLUGIN_DEP_LIBS) $(GCOV_LIBS) 
-
-drizzled_drizzled_DEPENDENCIES= ${noinst_LTLIBRARIES} $(pandora_plugin_libs)
+			 $(LIBPCRE) \
+			 $(LIBINTL) \
+			 drizzled/libdrizzled.la
 
 drizzled_drizzled_LDFLAGS= -export-dynamic
 
-drizzled_drizzled_SOURCES= \
-			   drizzled/alter_info.cc \
-			   drizzled/cached_item.cc \
-			   drizzled/calendar.cc \
-			   drizzled/check_stack_overrun.cc \
-			   drizzled/comp_creator.cc \
-			   drizzled/create_field.cc \
-			   drizzled/current_session.cc \
-			   drizzled/cursor.cc \
-			   drizzled/decimal.cc \
-			   drizzled/diagnostics_area.cc \
-			   drizzled/drizzled.cc \
-			   drizzled/dtcollation.cc \
-			   drizzled/errmsg_print.cc \
-			   drizzled/field.cc \
-			   drizzled/field/blob.cc \
-			   drizzled/field/date.cc \
-			   drizzled/field/datetime.cc \
-			   drizzled/field/decimal.cc \
-			   drizzled/field/double.cc \
-			   drizzled/field/enum.cc \
-			   drizzled/field/int64_t.cc \
-			   drizzled/field/long.cc \
-			   drizzled/field/null.cc \
-			   drizzled/field/num.cc \
-			   drizzled/field/real.cc \
-			   drizzled/field/str.cc \
-			   drizzled/field/timestamp.cc \
-			   drizzled/field/varstring.cc \
-			   drizzled/field_conv.cc \
-			   drizzled/field_iterator.cc \
-			   drizzled/file_exchange.cc \
-			   drizzled/filesort.cc \
-			   drizzled/foreign_key.cc \
-			   drizzled/function/additive_op.cc \
-			   drizzled/function/coercibility.cc \
-			   drizzled/function/field.cc \
-			   drizzled/function/find_in_set.cc \
-			   drizzled/function/found_rows.cc \
-			   drizzled/function/func.cc \
-			   drizzled/function/get_system_var.cc \
-			   drizzled/function/get_user_var.cc \
-			   drizzled/function/last_insert.cc \
-			   drizzled/function/locate.cc \
-			   drizzled/function/math/abs.cc \
-			   drizzled/function/math/acos.cc \
-			   drizzled/function/math/asin.cc \
-			   drizzled/function/math/atan.cc \
-			   drizzled/function/math/ceiling.cc \
-			   drizzled/function/math/cos.cc \
-			   drizzled/function/math/decimal_typecast.cc \
-			   drizzled/function/math/divide.cc \
-			   drizzled/function/math/exp.cc \
-			   drizzled/function/math/floor.cc \
-			   drizzled/function/math/int.cc \
-			   drizzled/function/math/int_divide.cc \
-			   drizzled/function/math/int_val.cc \
-			   drizzled/function/math/integer.cc \
-			   drizzled/function/math/ln.cc \
-			   drizzled/function/math/log.cc \
-			   drizzled/function/math/minus.cc \
-			   drizzled/function/math/mod.cc \
-			   drizzled/function/math/multiply.cc \
-			   drizzled/function/math/neg.cc \
-			   drizzled/function/math/ord.cc \
-			   drizzled/function/math/plus.cc \
-			   drizzled/function/math/pow.cc \
-			   drizzled/function/math/rand.cc \
-			   drizzled/function/math/real.cc \
-			   drizzled/function/math/round.cc \
-			   drizzled/function/math/sin.cc \
-			   drizzled/function/math/sqrt.cc \
-			   drizzled/function/math/tan.cc \
-			   drizzled/function/min_max.cc \
-			   drizzled/function/num1.cc \
-			   drizzled/function/num_op.cc \
-			   drizzled/function/numhybrid.cc \
-			   drizzled/function/row_count.cc \
-			   drizzled/function/set_user_var.cc \
-			   drizzled/function/sign.cc \
-			   drizzled/function/str/alloc_buffer.cc \
-			   drizzled/function/str/binary.cc \
-			   drizzled/function/str/char.cc \
-			   drizzled/function/str/collation.cc \
-			   drizzled/function/str/concat.cc \
-			   drizzled/function/str/conv.cc \
-			   drizzled/function/str/conv_charset.cc \
-			   drizzled/function/str/elt.cc \
-			   drizzled/function/str/export_set.cc \
-			   drizzled/function/str/format.cc \
-			   drizzled/function/str/insert.cc \
-			   drizzled/function/str/left.cc \
-			   drizzled/function/str/load_file.cc \
-			   drizzled/function/str/make_set.cc \
-			   drizzled/function/str/pad.cc \
-			   drizzled/function/str/quote.cc \
-			   drizzled/function/str/repeat.cc \
-			   drizzled/function/str/replace.cc \
-			   drizzled/function/str/right.cc \
-			   drizzled/function/str/set_collation.cc \
-			   drizzled/function/str/str_conv.cc \
-			   drizzled/function/str/strfunc.cc \
-			   drizzled/function/str/trim.cc \
-			   drizzled/function/time/curdate.cc \
-			   drizzled/function/time/date.cc \
-			   drizzled/function/time/date_add_interval.cc \
-			   drizzled/function/time/date_format.cc \
-			   drizzled/function/time/dayname.cc \
-			   drizzled/function/time/dayofmonth.cc \
-			   drizzled/function/time/dayofyear.cc \
-			   drizzled/function/time/extract.cc \
-			   drizzled/function/time/from_days.cc \
-			   drizzled/function/time/from_unixtime.cc \
-			   drizzled/function/time/hour.cc \
-			   drizzled/function/time/last_day.cc \
-			   drizzled/function/time/makedate.cc \
-			   drizzled/function/time/microsecond.cc \
-			   drizzled/function/time/minute.cc \
-			   drizzled/function/time/month.cc \
-			   drizzled/function/time/now.cc \
-			   drizzled/function/time/period_add.cc \
-			   drizzled/function/time/period_diff.cc \
-			   drizzled/function/time/quarter.cc \
-			   drizzled/function/time/second.cc \
-			   drizzled/function/time/sysdate_local.cc \
-			   drizzled/function/time/timestamp_diff.cc \
-			   drizzled/function/time/to_days.cc \
-			   drizzled/function/time/typecast.cc \
-			   drizzled/function/time/unix_timestamp.cc \
-			   drizzled/function/time/weekday.cc \
-			   drizzled/function/time/year.cc \
-			   drizzled/function/units.cc \
-			   drizzled/function/user_var_as_out_param.cc \
-			   drizzled/ha_commands.cc \
-			   drizzled/hybrid_type_traits.cc \
-			   drizzled/hybrid_type_traits_decimal.cc \
-			   drizzled/hybrid_type_traits_integer.cc \
-			   drizzled/index_hint.cc \
-			   drizzled/item.cc \
-			   drizzled/item/bin_string.cc \
-			   drizzled/item/cache.cc \
-			   drizzled/item/cache_decimal.cc \
-			   drizzled/item/cache_int.cc \
-			   drizzled/item/cache_real.cc \
-			   drizzled/item/cache_row.cc \
-			   drizzled/item/cache_str.cc \
-			   drizzled/item/cmpfunc.cc \
-			   drizzled/item/copy_string.cc \
-			   drizzled/item/create.cc \
-			   drizzled/item/decimal.cc \
-			   drizzled/item/default_value.cc \
-			   drizzled/item/direct_ref.cc \
-			   drizzled/item/empty_string.cc \
-			   drizzled/item/field.cc \
-			   drizzled/item/float.cc \
-			   drizzled/item/hex_string.cc \
-			   drizzled/item/ident.cc \
-			   drizzled/item/insert_value.cc \
-			   drizzled/item/int.cc \
-			   drizzled/item/int_with_ref.cc \
-			   drizzled/item/null.cc \
-			   drizzled/item/num.cc \
-			   drizzled/item/outer_ref.cc \
-			   drizzled/item/ref.cc \
-			   drizzled/item/ref_null_helper.cc \
-			   drizzled/item/row.cc \
-			   drizzled/item/string.cc \
-			   drizzled/item/subselect.cc \
-			   drizzled/item/sum.cc \
-			   drizzled/item/type_holder.cc \
-			   drizzled/item/uint.cc \
-			   drizzled/join.cc \
-			   drizzled/join_cache.cc \
-			   drizzled/join_table.cc \
-			   drizzled/key.cc \
-			   drizzled/key_map.cc \
-			   drizzled/lock.cc \
-			   drizzled/lookup_symbol.cc \
-			   drizzled/my_getsystime.cc \
-			   drizzled/my_hash.cc \
-			   drizzled/drizzle_time.cc \
-			   drizzled/tree.cc \
-			   drizzled/name_resolution_context_state.cc \
-			   drizzled/natural_join_column.cc \
-			   drizzled/optimizer/explain_plan.cc \
-			   drizzled/optimizer/key_field.cc \
-			   drizzled/optimizer/quick_group_min_max_select.cc \
-			   drizzled/optimizer/quick_index_merge_select.cc \
-			   drizzled/optimizer/quick_range.cc \
-			   drizzled/optimizer/quick_range_select.cc \
-			   drizzled/optimizer/quick_ror_intersect_select.cc \
-			   drizzled/optimizer/quick_ror_union_select.cc \
-			   drizzled/optimizer/range.cc \
-			   drizzled/optimizer/sel_arg.cc \
-			   drizzled/optimizer/sel_imerge.cc \
-			   drizzled/optimizer/sel_tree.cc \
-			   drizzled/optimizer/sum.cc \
-			   drizzled/plugin/authentication.cc \
-			   drizzled/plugin/authorization.cc \
-			   drizzled/plugin/client.cc \
-			   drizzled/plugin/error_message.cc \
-			   drizzled/plugin/function.cc \
-			   drizzled/plugin/library.cc \
-			   drizzled/plugin/listen.cc \
-			   drizzled/plugin/listen_tcp.cc \
-			   drizzled/plugin/loader.cc \
-			   drizzled/plugin/logging.cc \
-			   drizzled/plugin/monitored_in_transaction.cc \
-			   drizzled/plugin/plugin.cc \
-			   drizzled/plugin/query_cache.cc \
-			   drizzled/plugin/query_rewrite.cc \
-			   drizzled/plugin/registry.cc \
-			   drizzled/plugin/scheduler.cc \
-			   drizzled/plugin/schema_engine.cc \
-			   drizzled/plugin/storage_engine.cc \
-			   drizzled/plugin/table_function.cc \
-			   drizzled/plugin/transaction_applier.cc \
-			   drizzled/plugin/transaction_replicator.cc \
-			   drizzled/plugin/transactional_storage_engine.cc \
-			   drizzled/plugin/xa_resource_manager.cc \
-			   drizzled/plugin/xa_storage_engine.cc \
-			   drizzled/query_id.cc \
-			   drizzled/records.cc \
-			   drizzled/replication_services.cc \
-			   drizzled/resource_context.cc \
-			   drizzled/schema_identifier.cc \
-			   drizzled/session.cc \
-			   drizzled/session_list.cc \
-			   drizzled/set_var.cc \
-			   drizzled/show.cc \
-			   drizzled/sql_base.cc \
-			   drizzled/sql_bitmap.cc \
-			   drizzled/sql_delete.cc \
-			   drizzled/sql_derived.cc \
-			   drizzled/sql_error.cc \
-			   drizzled/sql_insert.cc \
-			   drizzled/sql_lex.cc \
-			   drizzled/sql_list.cc \
-			   drizzled/sql_load.cc \
-			   drizzled/sql_locale.cc \
-			   drizzled/sql_parse.cc \
-			   drizzled/sql_select.cc \
-			   drizzled/sql_state.cc \
-			   drizzled/sql_string.cc \
-			   drizzled/sql_table.cc \
-			   drizzled/sql_union.cc \
-			   drizzled/sql_update.cc \
-			   drizzled/sql_yacc.yy \
-			   drizzled/stacktrace.cc \
-			   drizzled/statement/alter_schema.cc \
-			   drizzled/statement/alter_table.cc \
-			   drizzled/statement/analyze.cc \
-			   drizzled/statement/change_schema.cc \
-			   drizzled/statement/check.cc \
-			   drizzled/statement/commit.cc \
-			   drizzled/statement/create_index.cc \
-			   drizzled/statement/create_schema.cc \
-			   drizzled/statement/create_table.cc \
-			   drizzled/statement/delete.cc \
-			   drizzled/statement/drop_index.cc \
-			   drizzled/statement/drop_schema.cc \
-			   drizzled/statement/drop_table.cc \
-			   drizzled/statement/empty_query.cc \
-			   drizzled/statement/flush.cc \
-			   drizzled/statement/insert.cc \
-			   drizzled/statement/insert_select.cc \
-			   drizzled/statement/kill.cc \
-			   drizzled/statement/load.cc \
-			   drizzled/statement/release_savepoint.cc \
-			   drizzled/statement/rename_table.cc \
-			   drizzled/statement/replace.cc \
-			   drizzled/statement/replace_select.cc \
-			   drizzled/statement/rollback.cc \
-			   drizzled/statement/rollback_to_savepoint.cc \
-			   drizzled/statement/savepoint.cc \
-			   drizzled/statement/select.cc \
-			   drizzled/statement/set_option.cc \
-			   drizzled/statement/show_create.cc \
-			   drizzled/statement/show_create_schema.cc \
-			   drizzled/statement/show_errors.cc \
-			   drizzled/statement/show_warnings.cc \
-			   drizzled/statement/start_transaction.cc \
-			   drizzled/statement/truncate.cc \
-			   drizzled/statement/unlock_tables.cc \
-			   drizzled/statement/update.cc \
-			   drizzled/strfunc.cc \
-			   drizzled/table.cc \
-			   drizzled/table_function_container.cc \
-			   drizzled/table_identifier.cc \
-			   drizzled/table_list.cc \
-			   drizzled/table_share.cc \
-			   drizzled/temporal.cc \
-			   drizzled/temporal_format.cc \
-			   drizzled/temporal_interval.cc \
-			   drizzled/thr_lock.cc \
-			   drizzled/time_functions.cc \
-			   drizzled/transaction_services.cc \
-			   drizzled/tztime.cc \
-			   drizzled/uniques.cc \
-			   drizzled/user_var_entry.cc \
-			   drizzled/version.cc \
-			   drizzled/xid.cc
-
 noinst_LTLIBRARIES+= \
 		     drizzled/libcached_directory.la \
 		     drizzled/libcharset.la \

=== modified file 'drizzled/internal/include.am'
--- drizzled/internal/include.am	2010-02-04 08:14:46 +0000
+++ drizzled/internal/include.am	2010-04-19 20:33:26 +0000
@@ -34,7 +34,8 @@
 		drizzled/liberror.la \
 		drizzled/libgetopt.la \
 		drizzled/libmemory.la \
-		drizzled/libtypelib.la
+		drizzled/libtypelib.la \
+		drizzled/libserialutil.la
 
 drizzled_internal_libinternal_la_SOURCES= \
 		drizzled/internal/bmove_upp.cc \

=== modified file 'drizzled/internal/my_pthread.h'
--- drizzled/internal/my_pthread.h	2010-02-04 08:14:46 +0000
+++ drizzled/internal/my_pthread.h	2010-04-19 20:33:26 +0000
@@ -19,7 +19,6 @@
 #define DRIZZLED_INTERNAL_MY_PTHREAD_H
 
 #include <unistd.h>
-#include <signal.h>
 
 #ifndef ETIME
 #define ETIME ETIMEDOUT				/* For FreeBSD */
@@ -45,29 +44,6 @@
 #define pthread_handler_t void *
 typedef void *(* pthread_handler)(void *);
 
-
-/*
-  We define my_sigset() and use that instead of the system sigset() so that
-  we can favor an implementation based on sigaction(). On some systems, such
-  as Mac OS X, sigset() results in flags such as SA_RESTART being set, and
-  we want to make sure that no such flags are set.
-*/
-#if !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \
-                            assert((A) != 0);                          \
-                            sigemptyset(&l_set);                            \
-                            l_s.sa_handler = (B);                           \
-                            l_s.sa_mask   = l_set;                          \
-                            l_s.sa_flags   = 0;                             \
-                            l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\
-                            assert(l_rc == 0);                         \
-                          } while (0)
-#elif defined(HAVE_SIGSET) && !defined(my_sigset)
-#define my_sigset(A,B) sigset((A),(B))
-#elif !defined(my_sigset)
-#define my_sigset(A,B) signal((A),(B))
-#endif
-
 #ifndef my_pthread_attr_setprio
 #ifdef HAVE_PTHREAD_ATTR_SETPRIO
 #define my_pthread_attr_setprio(A,B) pthread_attr_setprio((A),(B))

=== added file 'drizzled/main.cc'
--- drizzled/main.cc	1970-01-01 00:00:00 +0000
+++ drizzled/main.cc	2010-04-19 20:33:26 +0000
@@ -0,0 +1,328 @@
+/* -*- 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
+ */
+
+#include "config.h"
+
+#include <pthread.h>
+#include <signal.h>
+#include <sys/resource.h>
+#include <unistd.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#if defined(HAVE_LOCALE_H)
+# include <locale.h>
+#endif
+
+
+#include "drizzled/plugin.h"
+#include "drizzled/gettext.h"
+#include "drizzled/configmake.h"
+#include "drizzled/session.h"
+#include "drizzled/internal/my_sys.h"
+#include "drizzled/unireg.h"
+#include "drizzled/stacktrace.h"
+#include "drizzled/drizzled.h"
+#include "drizzled/errmsg_print.h"
+#include "drizzled/data_home.h"
+#include "drizzled/plugin/listen.h"
+#include "drizzled/plugin/client.h"
+#include "drizzled/pthread_globals.h"
+#include "drizzled/tztime.h"
+#include "drizzled/signal_handler.h"
+#include "drizzled/replication_services.h"
+
+using namespace drizzled;
+using namespace std;
+
+static pthread_t select_thread;
+static uint32_t thr_kill_signal;
+
+/**
+  All global error messages are sent here where the first one is stored
+  for the client.
+*/
+static void my_message_sql(uint32_t error, const char *str, myf MyFlags)
+{
+  Session *session;
+  /*
+    Put here following assertion when situation with EE_* error codes
+    will be fixed
+  */
+  if ((session= current_session))
+  {
+    if (MyFlags & ME_FATALERROR)
+      session->is_fatal_error= 1;
+
+    /*
+      TODO: There are two exceptions mechanism (Session and sp_rcontext),
+      this could be improved by having a common stack of handlers.
+    */
+    if (session->handle_error(error, str,
+                          DRIZZLE_ERROR::WARN_LEVEL_ERROR))
+      return;;
+
+    /*
+      session->lex->current_select == 0 if lex structure is not inited
+      (not query command (COM_QUERY))
+    */
+    if (! (session->lex->current_select &&
+        session->lex->current_select->no_error && !session->is_fatal_error))
+    {
+      if (! session->main_da.is_error())            // Return only first message
+      {
+        if (error == 0)
+          error= ER_UNKNOWN_ERROR;
+        if (str == NULL)
+          str= ER(error);
+        session->main_da.set_error_status(error, str);
+      }
+    }
+
+    if (!session->no_warnings_for_error && !session->is_fatal_error)
+    {
+      /*
+        Suppress infinite recursion if there a memory allocation error
+        inside push_warning.
+      */
+      session->no_warnings_for_error= true;
+      push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_ERROR, error, str);
+      session->no_warnings_for_error= false;
+      }
+    }
+    if (!session || MyFlags & ME_NOREFRESH)
+        errmsg_printf(ERRMSG_LVL_ERROR, "%s: %s",internal::my_progname,str);
+}
+
+static void init_signals(void)
+{
+  sigset_t set;
+  struct sigaction sa;
+
+  if (!(test_flags.test(TEST_NO_STACKTRACE) || 
+        test_flags.test(TEST_CORE_ON_SIGNAL)))
+  {
+    sa.sa_flags = SA_RESETHAND | SA_NODEFER;
+    sigemptyset(&sa.sa_mask);
+    sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL);
+
+    init_stacktrace();
+    sa.sa_handler= drizzled_handle_segfault;
+    sigaction(SIGSEGV, &sa, NULL);
+    sigaction(SIGABRT, &sa, NULL);
+#ifdef SIGBUS
+    sigaction(SIGBUS, &sa, NULL);
+#endif
+    sigaction(SIGILL, &sa, NULL);
+    sigaction(SIGFPE, &sa, NULL);
+  }
+
+  if (test_flags.test(TEST_CORE_ON_SIGNAL))
+  {
+    /* Change limits so that we will get a core file */
+    struct rlimit rl;
+    rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
+    if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings)
+        errmsg_printf(ERRMSG_LVL_WARN,
+                      _("setrlimit could not change the size of core files "
+                        "to 'infinity';  We may not be able to generate a "
+                        "core file on signals"));
+  }
+  (void) sigemptyset(&set);
+  ignore_signal(SIGPIPE);
+  sigaddset(&set,SIGPIPE);
+#ifndef IGNORE_SIGHUP_SIGQUIT
+  sigaddset(&set,SIGQUIT);
+  sigaddset(&set,SIGHUP);
+#endif
+  sigaddset(&set,SIGTERM);
+
+  /* Fix signals if blocked by parents (can happen on Mac OS X) */
+  sigemptyset(&sa.sa_mask);
+  sa.sa_flags = 0;
+  sa.sa_handler = drizzled_print_signal_warning;
+  sigaction(SIGTERM, &sa, NULL);
+  sa.sa_flags = 0;
+  sa.sa_handler = drizzled_print_signal_warning;
+  sigaction(SIGHUP, &sa, NULL);
+#ifdef SIGTSTP
+  sigaddset(&set,SIGTSTP);
+#endif
+  if (test_flags.test(TEST_SIGINT))
+  {
+    sa.sa_flags= 0;
+    sa.sa_handler= drizzled_end_thread_signal;
+    sigaction(thr_kill_signal, &sa, NULL);
+
+    // May be SIGINT
+    sigdelset(&set, thr_kill_signal);
+  }
+  else
+    sigaddset(&set,SIGINT);
+  sigprocmask(SIG_SETMASK,&set,NULL);
+  pthread_sigmask(SIG_SETMASK,&set,NULL);
+  return;
+}
+
+
+int main(int argc, char **argv)
+{
+#if defined(ENABLE_NLS)
+# if defined(HAVE_LOCALE_H)
+  setlocale(LC_ALL, "");
+# endif
+  bindtextdomain("drizzle", LOCALEDIR);
+  textdomain("drizzle");
+#endif
+
+  plugin::Registry &plugins= plugin::Registry::singleton();
+  plugin::Client *client;
+  Session *session;
+
+  MY_INIT(argv[0]);		// init my_sys library & pthreads
+  /* nothing should come before this line ^^^ */
+
+  /* Set signal used to kill Drizzle */
+#if defined(SIGUSR2)
+  thr_kill_signal= internal::thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
+#else
+  thr_kill_signal= SIGINT;
+#endif
+
+  if (init_common_variables(DRIZZLE_CONFIG_NAME,
+			    argc, argv, load_default_groups))
+    unireg_abort(1);				// Will do exit
+
+  init_signals();
+
+
+  select_thread=pthread_self();
+  select_thread_in_use=1;
+
+  if (chdir(data_home_real) && !opt_help)
+  {
+    errmsg_printf(ERRMSG_LVL_ERROR, _("Data directory %s does not exist\n"), data_home_real);
+    unireg_abort(1);
+  }
+  data_home= data_home_buff;
+  data_home[0]=FN_CURLIB;		// all paths are relative from here
+  data_home[1]=0;
+  data_home_len= 2;
+
+  if ((user_info= check_user(drizzled_user)))
+  {
+    set_user(drizzled_user, user_info);
+  }
+
+  if (server_id == 0)
+  {
+    server_id= 1;
+  }
+
+  if (init_server_components(plugins))
+    unireg_abort(1);
+
+  /**
+   * This check must be done after init_server_components for now
+   * because we don't yet have plugin dependency tracking...
+   *
+   * ReplicationServices::evaluateRegisteredPlugins() will print error messages to stderr
+   * via errmsg_printf().
+   *
+   * @todo
+   *
+   * not checking return since unireg_abort() hangs
+   */
+  ReplicationServices &replication_services= ReplicationServices::singleton();
+    (void) replication_services.evaluateRegisteredPlugins();
+
+  if (plugin::Listen::setup())
+    unireg_abort(1);
+
+  /*
+    init signals & alarm
+    After this we can't quit by a simple unireg_abort
+  */
+  error_handler_hook= my_message_sql;
+
+  assert(plugin::num_trx_monitored_objects > 0);
+  if (drizzle_rm_tmp_tables() ||
+      my_tz_init((Session *)0, default_tz_name))
+  {
+    abort_loop= true;
+    select_thread_in_use=0;
+    (void) pthread_kill(signal_thread, SIGTERM);
+
+    (void) unlink(pidfile_name);	// Not needed anymore
+
+    exit(1);
+  }
+
+  init_status_vars();
+
+  errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_STARTUP)), internal::my_progname,
+                PANDORA_RELEASE_VERSION, COMPILATION_COMMENT);
+
+
+  /* Listen for new connections and start new session for each connection
+     accepted. The listen.getClient() method will return NULL when the server
+     should be shutdown. */
+  while ((client= plugin::Listen::getClient()) != NULL)
+  {
+    if (!(session= new Session(client)))
+    {
+      delete client;
+      continue;
+    }
+
+    /* If we error on creation we drop the connection and delete the session. */
+    if (session->schedule())
+      Session::unlink(session);
+  }
+
+  /* (void) pthread_attr_destroy(&connection_attrib); */
+
+
+  (void) pthread_mutex_lock(&LOCK_thread_count);
+  select_thread_in_use=0;			// For close_connections
+  (void) pthread_mutex_unlock(&LOCK_thread_count);
+  (void) pthread_cond_broadcast(&COND_thread_count);
+
+  /* Wait until cleanup is done */
+  (void) pthread_mutex_lock(&LOCK_thread_count);
+  while (!ready_to_exit)
+    pthread_cond_wait(&COND_server_end,&LOCK_thread_count);
+  (void) pthread_mutex_unlock(&LOCK_thread_count);
+
+  clean_up(1);
+  plugin::Registry::shutdown();
+  clean_up_mutexes();
+  internal::my_end();
+  return 0;
+}
+

=== modified file 'drizzled/message/include.am'
--- drizzled/message/include.am	2010-02-24 00:03:28 +0000
+++ drizzled/message/include.am	2010-04-19 20:33:26 +0000
@@ -35,11 +35,12 @@
 		  drizzled/message/transaction_reader \
 		  drizzled/message/transaction_writer
 
-noinst_LTLIBRARIES += drizzled/message/libdrizzledmessage.la
+lib_LTLIBRARIES += drizzled/message/libdrizzledmessage.la
 
 drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
 
 drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
+drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF}
 
 nobase_dist_include_HEADERS+= drizzled/message/statement_transform.h
 
@@ -88,11 +89,11 @@
 drizzled_message_master_list_reader_LDADD = ${MESSAGE_LDADD}
 drizzled_message_master_list_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
 
-drizzled_message_transaction_writer_SOURCES =  drizzled/message/transaction_writer.cc drizzled/message/transaction.pb.cc
+drizzled_message_transaction_writer_SOURCES =  drizzled/message/transaction_writer.cc
 drizzled_message_transaction_writer_LDADD = ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la
 drizzled_message_transaction_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
 
-drizzled_message_transaction_reader_SOURCES =  drizzled/message/transaction_reader.cc drizzled/message/transaction.pb.cc
+drizzled_message_transaction_reader_SOURCES =  drizzled/message/transaction_reader.cc
 drizzled_message_transaction_reader_LDADD = ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la ${top_builddir}/drizzled/util/libutil.la
 drizzled_message_transaction_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
 

=== modified file 'drizzled/optimizer/range.cc'
--- drizzled/optimizer/range.cc	2010-03-22 05:47:41 +0000
+++ drizzled/optimizer/range.cc	2010-04-19 20:33:26 +0000
@@ -272,11 +272,6 @@
                                                         bool *are_all_covering);
 
 static
-optimizer::RorIntersectReadPlan *get_best_covering_ror_intersect(optimizer::Parameter *param,
-                                                                 optimizer::SEL_TREE *tree,
-                                                                 double read_time);
-
-static
 optimizer::TableReadPlan *get_best_disjunct_quick(optimizer::Parameter *param,
                                                   optimizer::SEL_IMERGE *imerge,
                                                   double read_time);
@@ -816,14 +811,6 @@
           {
             best_trp= rori_trp;
             best_read_time= best_trp->read_cost;
-            /*
-              Try constructing covering ROR-intersect only if it looks possible
-              and worth doing.
-            */
-            if (rori_trp->isRowRetrievalNecessary() && can_build_covering &&
-                (rori_trp= get_best_covering_ror_intersect(&param, tree,
-                                                           best_read_time)))
-              best_trp= rori_trp;
           }
         }
       }
@@ -1276,40 +1263,6 @@
   return (val1 < val2)? -1: (val1 == val2)? 0 : 1;
 }
 
-/*
-  Compare two ROR_SCAN_INFO** by
-   (#covered fields in F desc,
-    #components asc,
-    number of first not covered component asc)
-
-  SYNOPSIS
-    cmp_ror_scan_info_covering()
-      a ptr to first compared value
-      b ptr to second compared value
-
-  RETURN
-   -1 a < b
-    0 a = b
-    1 a > b
-*/
-
-static int cmp_ror_scan_info_covering(ROR_SCAN_INFO** a, ROR_SCAN_INFO** b)
-{
-  if ((*a)->used_fields_covered > (*b)->used_fields_covered)
-    return -1;
-  if ((*a)->used_fields_covered < (*b)->used_fields_covered)
-    return 1;
-  if ((*a)->key_components < (*b)->key_components)
-    return -1;
-  if ((*a)->key_components > (*b)->key_components)
-    return 1;
-  if ((*a)->first_uncovered_field < (*b)->first_uncovered_field)
-    return -1;
-  if ((*a)->first_uncovered_field > (*b)->first_uncovered_field)
-    return 1;
-  return 0;
-}
-
 
 /* Auxiliary structure for incremental ROR-intersection creation */
 typedef struct
@@ -1830,140 +1783,6 @@
 
 
 /*
-  Get best covering ROR-intersection.
-  SYNOPSIS
-    get_best_covering_ror_intersect()
-      param     Parameter from test_quick_select function.
-      tree      optimizer::SEL_TREE with sets of intervals for different keys.
-      read_time Don't return table read plans with cost > read_time.
-
-  RETURN
-    Best covering ROR-intersection plan
-    NULL if no plan found.
-
-  NOTES
-    get_best_ror_intersect must be called for a tree before calling this
-    function for it.
-    This function invalidates tree->ror_scans member values.
-
-  The following approximate algorithm is used:
-    I=set of all covering indexes
-    F=set of all fields to cover
-    S={}
-
-    do
-    {
-      Order I by (#covered fields in F desc,
-                  #components asc,
-                  number of first not covered component asc);
-      F=F-covered by first(I);
-      S=S+first(I);
-      I=I-first(I);
-    } while F is not empty.
-*/
-
-static
-optimizer::RorIntersectReadPlan *get_best_covering_ror_intersect(optimizer::Parameter *param,
-                                                            optimizer::SEL_TREE *tree,
-                                                            double read_time)
-{
-  ROR_SCAN_INFO **ror_scan_mark;
-  ROR_SCAN_INFO **ror_scans_end= tree->ror_scans_end;
-
-  for (ROR_SCAN_INFO **scan= tree->ror_scans; scan != ror_scans_end; ++scan)
-    (*scan)->key_components=
-      param->table->key_info[(*scan)->keynr].key_parts;
-
-  /*
-    Run covering-ROR-search algorithm.
-    Assume set I is [ror_scan .. ror_scans_end)
-  */
-
-  /*I=set of all covering indexes */
-  ror_scan_mark= tree->ror_scans;
-
-  MyBitmap *covered_fields= &param->tmp_covered_fields;
-  if (! covered_fields->getBitmap())
-  {
-    my_bitmap_map *tmp_bitmap= (my_bitmap_map*)alloc_root(param->mem_root,
-                                               param->fields_bitmap_size);
-    covered_fields->setBitmap(tmp_bitmap);
-  }
-  if (! covered_fields->getBitmap() ||
-      covered_fields->init(covered_fields->getBitmap(),
-                           param->table->s->fields))
-    return 0;
-  covered_fields->clearAll();
-
-  double total_cost= 0.0f;
-  ha_rows records=0;
-  bool all_covered;
-
-  do
-  {
-    /*
-      Update changed sorting info:
-        #covered fields,
-	number of first not covered component
-      Calculate and save these values for each of remaining scans.
-    */
-    for (ROR_SCAN_INFO **scan= ror_scan_mark; scan != ror_scans_end; ++scan)
-    {
-      bitmap_subtract(&(*scan)->covered_fields, covered_fields);
-      (*scan)->used_fields_covered=
-        (*scan)->covered_fields.getBitsSet();
-      (*scan)->first_uncovered_field=
-        (*scan)->covered_fields.getFirst();
-    }
-
-    internal::my_qsort(ror_scan_mark, ror_scans_end-ror_scan_mark,
-                       sizeof(ROR_SCAN_INFO*),
-                       (qsort_cmp)cmp_ror_scan_info_covering);
-
-    /* I=I-first(I) */
-    total_cost += (*ror_scan_mark)->index_read_cost;
-    records += (*ror_scan_mark)->records;
-    if (total_cost > read_time)
-      return NULL;
-    /* F=F-covered by first(I) */
-    bitmap_union(covered_fields, &(*ror_scan_mark)->covered_fields);
-    all_covered= bitmap_is_subset(&param->needed_fields, covered_fields);
-  } while ((++ror_scan_mark < ror_scans_end) && !all_covered);
-
-  if (!all_covered || (ror_scan_mark - tree->ror_scans) == 1)
-    return NULL;
-
-  /*
-    Ok, [tree->ror_scans .. ror_scan) holds covering index_intersection with
-    cost total_cost.
-  */
-  /* Add priority queue use cost. */
-  total_cost += rows2double(records)*
-                log((double)(ror_scan_mark - tree->ror_scans)) /
-                (TIME_FOR_COMPARE_ROWID * M_LN2);
-
-  if (total_cost > read_time)
-    return NULL;
-
-  optimizer::RorIntersectReadPlan *trp= NULL;
-  if (! (trp= new (param->mem_root) optimizer::RorIntersectReadPlan))
-  {
-    return trp;
-  }
-
-  uint32_t best_num= (ror_scan_mark - tree->ror_scans);
-  trp->ror_range_scans.assign(tree->ror_scans, tree->ror_scans + best_num);
-  trp->setRowRetrievalNecessary(true);
-  trp->read_cost= total_cost;
-  trp->records= records;
-  trp->cpk_scan= NULL;
-  set_if_smaller(param->table->quick_condition_rows, records);
-
-  return(trp);
-}
-
-
-/*
   Get best "range" table read plan for given optimizer::SEL_TREE, also update some info
 
   SYNOPSIS

=== modified file 'drizzled/pthread_globals.h'
--- drizzled/pthread_globals.h	2010-02-04 08:14:46 +0000
+++ drizzled/pthread_globals.h	2010-04-19 20:33:26 +0000
@@ -36,6 +36,7 @@
 extern pthread_cond_t COND_refresh;
 extern pthread_cond_t COND_thread_count;
 extern pthread_cond_t COND_global_read_lock;
+extern pthread_cond_t  COND_server_end;
 extern pthread_attr_t connection_attrib;
 extern pthread_t signal_thread;
 

=== modified file 'drizzled/schema_identifier.cc'
--- drizzled/schema_identifier.cc	2010-04-14 18:21:22 +0000
+++ drizzled/schema_identifier.cc	2010-04-19 20:33:26 +0000
@@ -61,7 +61,7 @@
    
 
   int rootdir_len= strlen(FN_ROOTDIR);
-  path.append(drizzle_data_home);
+  path.append(data_home);
   ssize_t without_rootdir= path.length() - rootdir_len;
 
   /* Don't add FN_ROOTDIR if dirzzle_data_home already includes it */

=== modified file 'drizzled/session.cc'
--- drizzled/session.cc	2010-04-08 16:25:53 +0000
+++ drizzled/session.cc	2010-04-19 20:33:26 +0000
@@ -46,6 +46,7 @@
 #include "drizzled/db.h"
 #include "drizzled/pthread_globals.h"
 #include "drizzled/transaction_services.h"
+#include "drizzled/drizzled.h"
 
 #include "plugin/myisam/myisam.h"
 #include "drizzled/internal/iocache.h"
@@ -74,8 +75,6 @@
 const char * const Session::DEFAULT_WHERE= "field list";
 extern pthread_key_t THR_Session;
 extern pthread_key_t THR_Mem_root;
-extern uint32_t max_used_connections;
-extern atomic<uint32_t> connection_count;
 
 
 /****************************************************************************
@@ -1048,13 +1047,13 @@
 
   if (!internal::dirname_length(exchange->file_name))
   {
-    strcpy(path, drizzle_real_data_home);
+    strcpy(path, data_home_real);
     if (! session->db.empty())
-      strncat(path, session->db.c_str(), FN_REFLEN-strlen(drizzle_real_data_home)-1);
+      strncat(path, session->db.c_str(), FN_REFLEN-strlen(data_home_real)-1);
     (void) internal::fn_format(path, exchange->file_name, path, "", option);
   }
   else
-    (void) internal::fn_format(path, exchange->file_name, drizzle_real_data_home, "", option);
+    (void) internal::fn_format(path, exchange->file_name, data_home_real, "", option);
 
   if (opt_secure_file_priv &&
       strncmp(opt_secure_file_priv, path, strlen(opt_secure_file_priv)))

=== modified file 'drizzled/session_list.cc'
--- drizzled/session_list.cc	2010-03-04 16:54:08 +0000
+++ drizzled/session_list.cc	2010-04-19 20:33:26 +0000
@@ -35,7 +35,7 @@
 
 SessionList session_list;
 
-vector<Session*> &getSessionList()
+SessionList &getSessionList()
 {
   return session_list;
 }

=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2010-04-07 15:56:28 +0000
+++ drizzled/set_var.cc	2010-04-19 20:33:26 +0000
@@ -143,7 +143,7 @@
                                                     fix_completion_type);
 static sys_var_collation_sv
 sys_collation_server(&vars, "collation_server", &system_variables::collation_server, &default_charset_info);
-static sys_var_const_str       sys_datadir(&vars, "datadir", drizzle_real_data_home);
+static sys_var_const_str       sys_datadir(&vars, "datadir", data_home_real);
 
 static sys_var_session_uint64_t	sys_join_buffer_size(&vars, "join_buffer_size",
                                                      &system_variables::join_buff_size);

=== added file 'drizzled/signal_handler.cc'
--- drizzled/signal_handler.cc	1970-01-01 00:00:00 +0000
+++ drizzled/signal_handler.cc	2010-04-19 20:33:26 +0000
@@ -0,0 +1,212 @@
+/* -*- 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
+ */
+
+#include "config.h"
+
+#include <signal.h>
+
+#include "drizzled/signal_handler.h"
+#include "drizzled/drizzled.h"
+#include "drizzled/session.h"
+#include "drizzled/internal/my_sys.h"
+#include "drizzled/probes.h"
+#include "drizzled/plugin.h"
+#include "drizzled/plugin/scheduler.h"
+#include "plugin/myisam/keycache.h"
+
+using namespace drizzled;
+
+static uint32_t killed_threads;
+static bool segfaulted= false;
+
+/*
+ * We declare these extern "C" because they are passed to system callback functions
+ * and Sun Studio does not like it when those don't have C linkage. We prefix them
+ * because extern "C"-ing something effectively removes the namespace from the
+ * linker symbols, meaning they would be exporting symbols like "print_signal_warning
+ */
+extern "C"
+{
+
+void drizzled_print_signal_warning(int sig)
+{
+  if (global_system_variables.log_warnings)
+    errmsg_printf(ERRMSG_LVL_WARN, _("Got signal %d from thread %"PRIu64),
+                  sig, global_thread_id);
+#ifndef HAVE_BSD_SIGNALS
+  sigset_t set;
+  sigemptyset(&set);
+
+  struct sigaction sa;
+  sa.sa_handler= drizzled_print_signal_warning;
+  sa.sa_mask= set;
+  sa.sa_flags= 0;
+  sigaction(sig, &sa, NULL);  /* int. thread system calls */
+#endif
+  if (sig == SIGALRM)
+    alarm(2);					/* reschedule alarm */
+}
+
+/** Called when a thread is aborted. */
+void drizzled_end_thread_signal(int )
+{
+  Session *session=current_session;
+  if (session)
+  {
+    statistic_increment(killed_threads, &LOCK_status);
+    session->scheduler->killSessionNow(session);
+    DRIZZLE_CONNECTION_DONE(session->thread_id);
+  }
+  return;
+}
+
+void drizzled_handle_segfault(int sig)
+{
+  time_t curr_time;
+  struct tm tm;
+
+  /*
+    Strictly speaking, one needs a mutex here
+    but since we have got SIGSEGV already, things are a mess
+    so not having the mutex is not as bad as possibly using a buggy
+    mutex - so we keep things simple
+  */
+  if (segfaulted)
+  {
+    fprintf(stderr, _("Fatal signal %d while backtracing\n"), sig);
+    exit(1);
+  }
+
+  segfaulted= true;
+
+  curr_time= time(NULL);
+  if(curr_time == (time_t)-1)
+  {
+    fprintf(stderr, _("Fatal: time() call failed\n"));
+    exit(1);
+  }
+
+  localtime_r(&curr_time, &tm);
+  
+  fprintf(stderr,_("%02d%02d%02d %2d:%02d:%02d - drizzled got signal %d;\n"
+          "This could be because you hit a bug. It is also possible that "
+          "this binary\n or one of the libraries it was linked against is "
+          "corrupt, improperly built,\n or misconfigured. This error can "
+          "also be caused by malfunctioning hardware.\n"),
+          tm.tm_year % 100, tm.tm_mon+1, tm.tm_mday,
+          tm.tm_hour, tm.tm_min, tm.tm_sec,
+          sig);
+  fprintf(stderr, _("We will try our best to scrape up some info that "
+                    "will hopefully help diagnose\n"
+                    "the problem, but since we have already crashed, "
+                    "something is definitely wrong\nand this may fail.\n\n"));
+  fprintf(stderr, "key_buffer_size=%u\n",
+          (uint32_t) dflt_key_cache->key_cache_mem_size);
+  fprintf(stderr, "read_buffer_size=%ld\n", (long) global_system_variables.read_buff_size);
+  fprintf(stderr, "max_used_connections=%u\n", max_used_connections);
+  fprintf(stderr, "connection_count=%u\n", uint32_t(connection_count));
+  fprintf(stderr, _("It is possible that drizzled could use up to \n"
+                    "key_buffer_size + (read_buffer_size + "
+                    "sort_buffer_size)*thread_count\n"
+                    "bytes of memory\n"
+                    "Hope that's ok; if not, decrease some variables in the "
+                    "equation.\n\n"));
+
+#ifdef HAVE_STACKTRACE
+  Session *session= current_session;
+
+  if (! (test_flags.test(TEST_NO_STACKTRACE)))
+  {
+    fprintf(stderr,"session: 0x%lx\n",(long) session);
+    fprintf(stderr,_("Attempting backtrace. You can use the following "
+                     "information to find out\n"
+                     "where drizzled died. If you see no messages after this, "
+                     "something went\n"
+                     "terribly wrong...\n"));
+    print_stacktrace(session ? (unsigned char*) session->thread_stack : (unsigned char*) 0,
+                     my_thread_stack_size);
+  }
+  if (session)
+  {
+    const char *kreason= "UNKNOWN";
+    switch (session->killed) {
+    case Session::NOT_KILLED:
+      kreason= "NOT_KILLED";
+      break;
+    case Session::KILL_BAD_DATA:
+      kreason= "KILL_BAD_DATA";
+      break;
+    case Session::KILL_CONNECTION:
+      kreason= "KILL_CONNECTION";
+      break;
+    case Session::KILL_QUERY:
+      kreason= "KILL_QUERY";
+      break;
+    case Session::KILLED_NO_VALUE:
+      kreason= "KILLED_NO_VALUE";
+      break;
+    }
+    fprintf(stderr, _("Trying to get some variables.\n"
+                      "Some pointers may be invalid and cause the "
+                      "dump to abort...\n"));
+    safe_print_str("session->query", session->query, 1024);
+    fprintf(stderr, "session->thread_id=%"PRIu32"\n", (uint32_t) session->thread_id);
+    fprintf(stderr, "session->killed=%s\n", kreason);
+  }
+  fflush(stderr);
+#endif /* HAVE_STACKTRACE */
+
+  if (calling_initgroups)
+    fprintf(stderr, _("\nThis crash occurred while the server was calling "
+                      "initgroups(). This is\n"
+                      "often due to the use of a drizzled that is statically "
+                      "linked against glibc\n"
+                      "and configured to use LDAP in /etc/nsswitch.conf. "
+                      "You will need to either\n"
+                      "upgrade to a version of glibc that does not have this "
+                      "problem (2.3.4 or\n"
+                      "later when used with nscd), disable LDAP in your "
+                      "nsswitch.conf, or use a\n"
+                      "drizzled that is not statically linked.\n"));
+
+  if (internal::thd_lib_detected == THD_LIB_LT && !getenv("LD_ASSUME_KERNEL"))
+    fprintf(stderr,
+            _("\nYou are running a statically-linked LinuxThreads binary "
+              "on an NPTL system.\n"
+              "This can result in crashes on some distributions due "
+              "to LT/NPTL conflicts.\n"
+              "You should either build a dynamically-linked binary, or force "
+              "LinuxThreads\n"
+              "to be used with the LD_ASSUME_KERNEL environment variable. "
+              "Please consult\n"
+              "the documentation for your distribution on how to do that.\n"));
+
+#ifdef HAVE_WRITE_CORE
+  if (test_flags.test(TEST_CORE_ON_SIGNAL))
+  {
+    fprintf(stderr, _("Writing a core file\n"));
+    fflush(stderr);
+    write_core(sig);
+  }
+#endif
+
+  exit(1);
+}
+
+} /* extern "C" */

=== added file 'drizzled/signal_handler.h'
--- drizzled/signal_handler.h	1970-01-01 00:00:00 +0000
+++ drizzled/signal_handler.h	2010-04-19 20:33:26 +0000
@@ -0,0 +1,55 @@
+/* -*- 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 Monty Taylor
+ *
+ *  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_SIGNAL_HANDLER_H
+#define DRIZZLED_SIGNAL_HANDLER_H
+
+#include <signal.h>
+
+#include <cstdlib>
+#include <cassert>
+
+extern "C" void drizzled_print_signal_warning(int sig);
+extern "C" void drizzled_handle_segfault(int sig);
+extern "C" void drizzled_end_thread_signal(int sig);
+
+/*
+  posix sigaction() based signal handler implementation
+  On some systems, such as Mac OS X, sigset() results in flags
+  such as SA_RESTART being set, and we want to make sure that no such
+  flags are set.
+*/
+static inline void ignore_signal(int sig)
+{
+  /* Wow. There is a function sigaction which takes a pointer to a
+    struct sigaction. */
+  struct sigaction l_s;
+  sigset_t l_set;
+  sigemptyset(&l_set);
+
+  assert(sig != 0);
+  l_s.sa_handler= SIG_IGN;
+  l_s.sa_mask= l_set;
+  l_s.sa_flags= 0;
+  int l_rc= sigaction(sig, &l_s, NULL);
+  assert(l_rc == 0);
+}
+
+#endif /* DRIZZLED_SIGNAL_HANDLER_H */

=== modified file 'drizzled/sql_base.cc'
--- drizzled/sql_base.cc	2010-04-15 19:22:50 +0000
+++ drizzled/sql_base.cc	2010-04-19 20:33:26 +0000
@@ -51,6 +51,7 @@
 #include "drizzled/global_charset_info.h"
 #include "drizzled/pthread_globals.h"
 #include "drizzled/internal/iocache.h"
+#include "drizzled/drizzled.h"
 #include "drizzled/plugin/authorization.h"
 
 using namespace std;
@@ -60,8 +61,6 @@
 
 extern bool volatile shutdown_in_progress;
 
-bool drizzle_rm_tmp_tables();
-
 /**
   @defgroup Data_Dictionary Data Dictionary
   @{

=== modified file 'drizzled/sql_load.cc'
--- drizzled/sql_load.cc	2010-03-31 21:15:40 +0000
+++ drizzled/sql_load.cc	2010-04-19 20:33:26 +0000
@@ -258,14 +258,14 @@
 #endif
     if (!internal::dirname_length(ex->file_name))
     {
-      strcpy(name, drizzle_real_data_home);
-      strncat(name, tdb, FN_REFLEN-strlen(drizzle_real_data_home)-1);
+      strcpy(name, data_home_real);
+      strncat(name, tdb, FN_REFLEN-strlen(data_home_real)-1);
       (void) internal::fn_format(name, ex->file_name, name, "",
 		       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
     }
     else
     {
-      (void) internal::fn_format(name, ex->file_name, drizzle_real_data_home, "",
+      (void) internal::fn_format(name, ex->file_name, data_home_real, "",
 		       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
 
       if (opt_secure_file_priv &&

=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2010-04-11 17:19:47 +0000
+++ drizzled/sql_table.cc	2010-04-19 20:33:26 +0000
@@ -54,7 +54,6 @@
 namespace drizzled
 {
 
-extern plugin::StorageEngine *myisam_engine;
 extern pid_t current_pid;
 
 bool is_primary_key(KEY *key_info)
@@ -1618,9 +1617,6 @@
       old_name                  The old table name.
       new_db                    The new database name.
       new_name                  The new table name.
-      flags                     flags for build_table_filename().
-                                FN_FROM_IS_TMP old_name is temporary.
-                                FN_TO_IS_TMP   new_name is temporary.
 
   RETURN
     false   OK
@@ -1630,8 +1626,7 @@
 bool
 mysql_rename_table(plugin::StorageEngine *base,
                    TableIdentifier &from,
-                   TableIdentifier &to,
-                   uint32_t )
+                   TableIdentifier &to)
 {
   Session *session= current_session;
   int error= 0;

=== modified file 'drizzled/sql_table.h'
--- drizzled/sql_table.h	2010-04-11 17:04:06 +0000
+++ drizzled/sql_table.h	2010-04-19 20:33:26 +0000
@@ -40,10 +40,6 @@
 class AlterInfo;
 class Cursor;
 
-/* Flags for conversion functions. */
-static const uint32_t FN_FROM_IS_TMP(1 << 0);
-static const uint32_t FN_TO_IS_TMP(1 << 0);
-
 namespace message { class Table; }
 class TableIdentifier;
 

=== modified file 'drizzled/stacktrace.cc'
--- drizzled/stacktrace.cc	2010-02-04 08:14:46 +0000
+++ drizzled/stacktrace.cc	2010-04-19 20:33:26 +0000
@@ -36,6 +36,10 @@
 #include <cstdio>
 #include <algorithm>
 
+#if defined(BACKTRACE_DEMANGLE)
+# include <cxxabi.h>
+#endif
+
 #include "drizzled/definitions.h"
 
 using namespace std;
@@ -74,8 +78,13 @@
 #define SIGRETURN_FRAME_OFFSET 23
 #endif
 
-
-#if BACKTRACE_DEMANGLE
+#if defined(BACKTRACE_DEMANGLE)
+
+static inline char *my_demangle(const char *mangled_name, int *status)
+{
+  return abi::__cxa_demangle(mangled_name, NULL, NULL, status);
+}
+
 static void my_demangle_symbols(char **addrs, int n)
 {
   int status, i;

=== modified file 'drizzled/stacktrace.h'
--- drizzled/stacktrace.h	2010-02-04 08:14:46 +0000
+++ drizzled/stacktrace.h	2010-04-19 20:33:26 +0000
@@ -35,10 +35,6 @@
 #define BACKTRACE_DEMANGLE 1
 #endif
 
-#if defined(BACKTRACE_DEMANGLE)
-extern "C" char *my_demangle(const char *mangled_name, int *status);
-#endif
-
 #ifdef TARGET_OS_LINUX
 #if defined(HAVE_STACKTRACE) || (defined (__x86_64__) || defined (__i386__) )
 #undef HAVE_STACKTRACE

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2010-04-08 16:25:53 +0000
+++ drizzled/statement/alter_table.cc	2010-04-19 20:33:26 +0000
@@ -931,7 +931,7 @@
         }
         else
         {
-          if (mysql_rename_table(original_engine, original_table_identifier, new_table_identifier, 0))
+          if (mysql_rename_table(original_engine, original_table_identifier, new_table_identifier))
           {
             error= -1;
           }
@@ -1125,7 +1125,7 @@
 
     new_table_identifier.setPath(new_table_as_temporary.getPath());
 
-    if (mysql_rename_table(new_engine, new_table_as_temporary, new_table_identifier, FN_FROM_IS_TMP) != 0)
+    if (mysql_rename_table(new_engine, new_table_as_temporary, new_table_identifier) != 0)
     {
       return true;
     }
@@ -1184,14 +1184,14 @@
     TableIdentifier original_table_to_drop(original_table_identifier.getSchemaName(),
                                            old_name, message::Table::TEMPORARY);
 
-    if (mysql_rename_table(original_engine, original_table_identifier, original_table_to_drop, FN_TO_IS_TMP))
+    if (mysql_rename_table(original_engine, original_table_identifier, original_table_to_drop))
     {
       error= 1;
       quick_rm_table(*session, new_table_as_temporary);
     }
     else
     {
-      if (mysql_rename_table(new_engine, new_table_as_temporary, new_table_identifier, FN_FROM_IS_TMP) != 0)
+      if (mysql_rename_table(new_engine, new_table_as_temporary, new_table_identifier) != 0)
       {
         /* Try to get everything back. */
         error= 1;
@@ -1200,7 +1200,7 @@
 
         quick_rm_table(*session, new_table_as_temporary);
 
-        mysql_rename_table(original_engine, original_table_to_drop, original_table_identifier, FN_FROM_IS_TMP);
+        mysql_rename_table(original_engine, original_table_to_drop, original_table_identifier);
       }
       else
       {

=== modified file 'drizzled/statement/rename_table.cc'
--- drizzled/statement/rename_table.cc	2010-03-25 19:25:04 +0000
+++ drizzled/statement/rename_table.cc	2010-04-19 20:33:26 +0000
@@ -171,7 +171,7 @@
     return 1; // This can't be skipped
   }
 
-  rc= mysql_rename_table(engine, old_identifier, new_identifier, 0);
+  rc= mysql_rename_table(engine, old_identifier, new_identifier);
   if (rc && ! skip_error)
     return true;
 

=== modified file 'drizzled/table.cc'
--- drizzled/table.cc	2010-04-01 12:38:11 +0000
+++ drizzled/table.cc	2010-04-19 20:33:26 +0000
@@ -1885,32 +1885,6 @@
 }
 
 /*
-  DESCRIPTION
-    given a buffer with a key value, and a map of keyparts
-    that are present in this value, returns the length of the value
-*/
-uint32_t calculate_key_len(Table *table, uint32_t key,
-                       const unsigned char *,
-                       key_part_map keypart_map)
-{
-  /* works only with key prefixes */
-  assert(((keypart_map + 1) & keypart_map) == 0);
-
-  KEY *key_info= table->s->key_info+key;
-  KEY_PART_INFO *key_part= key_info->key_part;
-  KEY_PART_INFO *end_key_part= key_part + key_info->key_parts;
-  uint32_t length= 0;
-
-  while (key_part < end_key_part && keypart_map)
-  {
-    length+= key_part->store_length;
-    keypart_map >>= 1;
-    key_part++;
-  }
-  return length;
-}
-
-/*
   Check if database name is valid
 
   SYNPOSIS

=== modified file 'drizzled/table_identifier.cc'
--- drizzled/table_identifier.cc	2010-03-31 06:34:03 +0000
+++ drizzled/table_identifier.cc	2010-04-19 20:33:26 +0000
@@ -145,8 +145,7 @@
      db                         Database name
      table_name                 Table name
      ext                        File extension.
-     flags                      FN_FROM_IS_TMP or FN_TO_IS_TMP
-                                table_name is temporary, do not change.
+     flags                      table_name is temporary, do not change.
 
   NOTES
 
@@ -174,7 +173,7 @@
   bool conversion_error= false;
 
   memset(tbbuff, 0, sizeof(tbbuff));
-  if (is_tmp) // FN_FROM_IS_TMP | FN_TO_IS_TMP
+  if (is_tmp) // It a conversion tmp
   {
     strncpy(tbbuff, table_name, sizeof(tbbuff));
   }
@@ -201,7 +200,7 @@
    
 
   int rootdir_len= strlen(FN_ROOTDIR);
-  path.append(drizzle_data_home);
+  path.append(data_home);
   ssize_t without_rootdir= path.length() - rootdir_len;
 
   /* Don't add FN_ROOTDIR if dirzzle_data_home already includes it */

=== modified file 'extra/include.am'
--- extra/include.am	2010-01-11 23:50:15 +0000
+++ extra/include.am	2010-04-19 20:33:26 +0000
@@ -4,7 +4,4 @@
 
 
 extra_my_print_defaults_SOURCES= extra/my_print_defaults.cc
-extra_my_print_defaults_LDADD= \
-		drizzled/internal/libinternal.la \
-		gnulib/libgnu.la \
-		$(LIBINTL)
+extra_my_print_defaults_LDADD= $(CLIENT_LDADD)

=== modified file 'plugin/archive/ha_archive.cc'
--- plugin/archive/ha_archive.cc	2010-04-01 15:54:57 +0000
+++ plugin/archive/ha_archive.cc	2010-04-19 20:33:26 +0000
@@ -769,20 +769,11 @@
   the optimizer that we have unique indexes, we scan
 */
 int ha_archive::index_read(unsigned char *buf, const unsigned char *key,
-                             uint32_t key_len, enum ha_rkey_function find_flag)
-{
-  int rc;
-  rc= index_read_idx(buf, active_index, key, key_len, find_flag);
-  return(rc);
-}
-
-
-int ha_archive::index_read_idx(unsigned char *buf, uint32_t index, const unsigned char *key,
-                               uint32_t key_len, enum ha_rkey_function)
+                             uint32_t key_len, enum ha_rkey_function)
 {
   int rc;
   bool found= 0;
-  KEY *mkey= &table->s->key_info[index];
+  KEY *mkey= &table->s->key_info[0];
   current_k_offset= mkey->key_part->offset;
   current_key= key;
   current_key_len= key_len;

=== modified file 'plugin/archive/ha_archive.h'
--- plugin/archive/ha_archive.h	2010-02-12 21:18:37 +0000
+++ plugin/archive/ha_archive.h	2010-04-19 20:33:26 +0000
@@ -96,10 +96,6 @@
   virtual int index_read(unsigned char * buf, const unsigned char * key,
 			 uint32_t key_len,
                          drizzled::ha_rkey_function find_flag);
-  virtual int index_read_idx(unsigned char * buf, uint32_t index,
-                             const unsigned char * key,
-			     uint32_t key_len,
-                             drizzled::ha_rkey_function find_flag);
   int index_next(unsigned char * buf);
   int open(const char *name, int mode, uint32_t test_if_locked);
   int close(void);

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-04-15 16:00:18 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-04-19 20:33:26 +0000
@@ -6469,7 +6469,7 @@
     }
 
     snprintf(path, sizeof(path), "%s/%s%s",
-             drizzle_data_home, ib_table->name, ".dfe");
+             data_home, ib_table->name, ".dfe");
 
     internal::unpack_filename(path,path);
 

=== modified file 'plugin/myisam/plugin.ini'
--- plugin/myisam/plugin.ini	2010-02-04 08:14:46 +0000
+++ plugin/myisam/plugin.ini	2010-04-19 20:33:26 +0000
@@ -18,6 +18,6 @@
 description=Legacy non-transactional MySQL tables
 load_by_default=yes
 sources=ha_myisam.cc
-libs=plugin/myisam/libmyisam.la drizzled/internal/libinternal.la
+libs=plugin/myisam/libmyisam.la
 ldflags=$(LIBZ) $(LIBINTL)
 static=yes

=== modified file 'plugin/pbxt/src/ha_pbxt.h'
--- plugin/pbxt/src/ha_pbxt.h	2010-04-14 16:29:40 +0000
+++ plugin/pbxt/src/ha_pbxt.h	2010-04-19 20:33:26 +0000
@@ -256,11 +256,11 @@
 	int		index_end();
 	int		index_read(byte * buf, const byte * key,
 								 uint key_len, enum ha_rkey_function find_flag);
-	int		index_read_idx(byte * buf, uint idx, const byte * key,
-										 uint key_len, enum ha_rkey_function find_flag);
-	int		index_read_xt(byte * buf, uint idx, const byte * key,
-										 uint key_len, enum ha_rkey_function find_flag);
-	int		index_next(byte * buf);
+        int		index_read_idx(byte * buf, uint idx, const byte * key,
+                                       uint key_len, enum ha_rkey_function find_flag);
+        int		index_read_xt(byte * buf, uint idx, const byte * key,
+                                      uint key_len, enum ha_rkey_function find_flag);
+        int		index_next(byte * buf);
 	int		index_next_same(byte * buf, const byte *key, uint length);
 	int		index_prev(byte * buf);
 	int		index_first(byte * buf);

=== modified file 'plugin/pbxt/src/myxt_xt.cc'
--- plugin/pbxt/src/myxt_xt.cc	2010-04-14 16:29:40 +0000
+++ plugin/pbxt/src/myxt_xt.cc	2010-04-19 20:33:26 +0000
@@ -2082,7 +2082,7 @@
 			message::Table::STANDARD);
 	} else {
 		std::string n;
-		n.append(drizzle_data_home);
+		n.append(data_home);
 		n.append("/");
 		n.append(db_name);
 		n.append("/");

=== modified file 'plugin/pbxt/src/table_xt.cc'
--- plugin/pbxt/src/table_xt.cc	2010-04-08 17:52:00 +0000
+++ plugin/pbxt/src/table_xt.cc	2010-04-19 20:33:26 +0000
@@ -683,17 +683,25 @@
 	 * Previously we only caclulated statistics when a handler was opened
 	 * and the underlying table was also opened.
 	 */
+	/* This (hack) fixes: warning: variable 'edx' might be clobbered by 'longjmp' or 'vfork' */
+	u_int save_edx;
+
 	xt_enum_tables_init(&edx);
 	while ((te_ptr = xt_enum_tables_next(self, db, &edx))) {
+		save_edx = edx;
+
 		xt_strcpy(PATH_MAX, pbuf, te_ptr->te_tab_path->tp_path);
 		xt_add_dir_char(PATH_MAX, pbuf);
 		xt_strcat(PATH_MAX, pbuf, te_ptr->te_tab_name);
 		try_(a) {
+			edx = 0;
 			xt_heap_release(self, xt_use_table_no_lock(self, db, (XTPathStrPtr)pbuf, FALSE, FALSE, NULL));
 		} catch_(a) {
+			edx = 0;
 			/* ignore errors */
 			xt_log_and_clear_warning(self);
 		} cont_(a);
+		edx = save_edx;
 	}
 
 	popr_(); // Discard xt_tab_exit_db(db)

=== modified file 'plugin/pbxt/src/xt_defs.h'
--- plugin/pbxt/src/xt_defs.h	2010-04-08 16:11:29 +0000
+++ plugin/pbxt/src/xt_defs.h	2010-04-19 20:33:26 +0000
@@ -903,7 +903,7 @@
 
 #define my_pthread_setspecific_ptr(T, V)	pthread_setspecific(T, (void*) (V))
 
-#define mysql_real_data_home				drizzle_real_data_home
+#define mysql_real_data_home				::drizzled::data_home
 
 #define mi_int4store(T,A)   { uint32_t def_temp= (uint32_t) (A);\
                               ((unsigned char*) (T))[3]= (unsigned char) (def_temp);\

=== modified file 'plugin/schema_engine/schema.cc'
--- plugin/schema_engine/schema.cc	2010-04-01 15:54:57 +0000
+++ plugin/schema_engine/schema.cc	2010-04-19 20:33:26 +0000
@@ -69,7 +69,7 @@
 
 void Schema::prime()
 {
-  CachedDirectory directory(drizzle_data_home, CachedDirectory::DIRECTORY);
+  CachedDirectory directory(data_home, CachedDirectory::DIRECTORY);
   CachedDirectory::Entries files= directory.getEntries();
 
   pthread_rwlock_wrlock(&schema_lock);
@@ -113,7 +113,7 @@
 
   // If for some reason getting a lock should fail, we resort to disk
 
-  CachedDirectory directory(drizzle_data_home, CachedDirectory::DIRECTORY);
+  CachedDirectory directory(data_home, CachedDirectory::DIRECTORY);
 
   CachedDirectory::Entries files= directory.getEntries();
 

=== modified file 'plugin/signal_handler/signal_handler.cc'
--- plugin/signal_handler/signal_handler.cc	2010-03-26 21:36:11 +0000
+++ plugin/signal_handler/signal_handler.cc	2010-04-19 20:33:26 +0000
@@ -23,6 +23,7 @@
 #include "drizzled/internal/my_pthread.h"
 #include "drizzled/internal/my_sys.h"
 #include "drizzled/plugin/daemon.h"
+#include "drizzled/signal_handler.h"
 
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -67,7 +68,7 @@
   kill_in_progress=true;
   abort_loop=1;					// This should be set
   if (sig != 0) // 0 is not a valid signal number
-    my_sigset(sig, SIG_IGN);                    /* purify inspected */
+    ignore_signal(sig);                    /* purify inspected */
   if (sig == SIGTERM || sig == 0)
     errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_NORMAL_SHUTDOWN)),internal::my_progname);
   else

=== modified file 'support-files/drizzle.spec.in'
--- support-files/drizzle.spec.in	2010-03-30 09:29:02 +0000
+++ support-files/drizzle.spec.in	2010-04-19 20:33:26 +0000
@@ -479,6 +479,12 @@
 %{_includedir}/drizzled/version.h
 %{_includedir}/drizzled/visibility.h
 %{_includedir}/drizzled/xid.h
+%{_libdir}/libdrizzled.la
+%{_libdir}/libdrizzled.so
+%{_libdir}/libdrizzled.so.*
+%{_libdir}/libdrizzledmessage.la
+%{_libdir}/libdrizzledmessage.so
+%{_libdir}/libdrizzledmessage.so.*
 %{_libdir}/drizzle/libarchive_plugin.la
 %{_libdir}/drizzle/libarchive_plugin.so
 %{_libdir}/drizzle/libascii_plugin.la

=== modified file 'tests/test-run.pl'
--- tests/test-run.pl	2010-03-31 18:10:36 +0000
+++ tests/test-run.pl	2010-04-19 20:33:26 +0000
@@ -3337,17 +3337,19 @@
     # write init file for mysqld
     mtr_tofile($gdb_init_file,
 	       "set args $str\n" .
+               "set breakpoint pending on\n" .
 	       "break drizzled::mysql_parse\n" .
 	       "commands 1\n" .
 	       "disable 1\n" .
 	       "end\n" .
+               "set breakpoint pending off\n" .
 	       "run");
   }
 
   if ( $opt_manual_gdb )
   {
      print "\nTo start gdb for $type, type in another window:\n";
-     print "gdb -cd $glob_mysql_test_dir -x $gdb_init_file $$exe\n";
+     print "$glob_mysql_test_dir/../libtool --mode=execute gdb -cd $glob_mysql_test_dir -x $gdb_init_file $$exe\n";
 
      # Indicate the exe should not be started
      $$exe= undef;

=== modified file 'tests/valgrind.supp'
--- tests/valgrind.supp	2010-04-12 23:31:44 +0000
+++ tests/valgrind.supp	2010-04-19 20:33:26 +0000
@@ -964,6 +964,30 @@
 }
 
 {
+   thr_local_hash static initialization
+   Memcheck:Leak
+   fun:malloc
+   fun:mem_heap_create_block
+   ...
+   fun:_ZL13innobase_initR14PluginRegistry
+   fun:_Z11plugin_initPiPPci
+   fun:_ZL22init_server_componentsv
+   fun:main
+}
+
+{
+   thr_local_hash static initialization
+   Memcheck:Leak
+   fun:malloc
+   fun:ut_malloc_low
+   ...
+   fun:_ZL13innobase_initR14PluginRegistry
+   fun:_Z11plugin_initPiPPci
+   fun:_ZL22init_server_componentsv
+   fun:main
+}
+
+{
    InnoDB Garbage
    Memcheck:Value8
    ...