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.

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.

Unmerged revisions

=== modified file 'Makefile.am'
--- Makefile.am	2010-03-23 08:23:32 +0000
+++ Makefile.am	2010-04-16 20:59:24 +0000
@@ -22,6 +22,7 @@
 noinst_HEADERS =
 nobase_nodist_include_HEADERS =
 nobase_dist_include_HEADERS =
+sbin_PROGRAMS =
 lib_LTLIBRARIES = 
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
@@ -66,19 +67,7 @@
 EXTRA_DIST+=	${man_MANS}
 
 .PHONY: \
-	indent \
-	test
-
-
-# Target 'test' will run the regression test suite using the built server.
-#
-# If you are running in a shared environment, users can avoid clashing
-# port numbers by setting individual small numbers 1-100 to the
-# environment variable MTR_BUILD_THREAD. The script "test-run"
-# will then calculate the various port numbers it needs from this,
-# making sure each user use different ports.
-
-test: test-drizzle
+	indent
 
 doxygen:
 	doxygen Doxyfile
@@ -136,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 'config/lint-source.am'
--- config/lint-source.am	2009-12-04 19:01:26 +0000
+++ config/lint-source.am	2010-04-16 20:59:24 +0000
@@ -14,7 +14,7 @@
 clean-local: cleanlints
 
 
-check-local: linted ${srcdir}/config/lint-rules.am
+installcheck-local: linted ${srcdir}/config/lint-rules.am
 
 linted:
 

=== modified file 'config/pandora-plugin'
--- config/pandora-plugin	2010-04-01 17:45:30 +0000
+++ config/pandora-plugin	2010-04-16 20:59:24 +0000
@@ -22,21 +22,7 @@
 import datetime, time
 import subprocess
 
-top_srcdir='.'
-top_builddir='.'
-plugin_ini_fname='plugin.ini'
-plugin_list=[]
-plugin_am_file=None
-plugin_ac_file=None
-plugin_prefix=''
-plugin_suffix='_plugin'
-extra_cflags=''
-extra_cppflags=''
-extra_cxxflags=''
-root_plugin_dir='plugin'
-pkgplugindir='$(libdir)/drizzle'
-default_install='True'
-default_plugin_version=''
+from pandora_plugin_config import *
 
 class ChangeProtectedFile(object):
 
@@ -143,19 +129,21 @@
 """ % plugin)
   if plugin['headers'] != "":
     plugin_file.write("noinst_HEADERS = %(headers)s\n" % plugin)
+  if plugin['install_headers'] != "":
+    plugin_file.write("nobase_include_HEADERS += %(install_headers)s\n" % plugin)
   if plugin['testsuite']:
     if plugin.has_key('testsuitedir') and plugin['testsuitedir'] != "":
       plugin_file.write("EXTRA_DIST += %(testsuitedir)s\n" % plugin)
   plugin_file.write("""
-pkgplugin_LTLIBRARIES=%(pname)s.la
-%(pname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
-%(pname)s_la_LIBADD=%(libs)s
-%(pname)s_la_DEPENDENCIES=%(libs)s
-%(pname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(name)s -DPANDORA_MODULE_AUTHOR="%(author)s" -DPANDORA_MODULE_TITLE="%(title)s" -DPANDORA_MODULE_VERSION="%(version)s" -DPANDORA_MODULE_LICENSE=%(license)s %(cppflags)s
-%(pname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
-%(pname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+pkgplugin_LTLIBRARIES=%(libname)s.la
+%(libname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+%(libname)s_la_LIBADD=%(libs)s
+%(libname)s_la_DEPENDENCIES=%(libs)s
+%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(name)s -DPANDORA_MODULE_AUTHOR='"%(author)s"' -DPANDORA_MODULE_TITLE='"%(title)s"' -DPANDORA_MODULE_VERSION='"%(version)s"' -DPANDORA_MODULE_LICENSE=%(license)s %(cppflags)s
+%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
 
-%(pname)s_la_SOURCES=%(sources)s
+%(libname)s_la_SOURCES=%(sources)s
 
 """ % plugin)
   plugin_am_file=os.path.join(plugin['rel_path'],'plugin.am')
@@ -165,7 +153,7 @@
 def write_external_plugin():
   """Return True if the plugin had changed."""
   plugin = read_plugin_ini('.')
-  expand_plugin_ini(plugin, '.')
+  expand_plugin_ini(plugin)
   plugin_file = ChangeProtectedFile('configure.ac')
   write_external_configure(plugin, plugin_file)
   result = plugin_file.close()
@@ -175,12 +163,33 @@
   result = plugin_file.close() or result
   return result
 
-def write_plugin(plugin_dir):
-  """Return True if the plugin had changed."""
-  plugin = read_plugin_ini(plugin_dir)
-  expand_plugin_ini(plugin, plugin_dir)
+def write_plugin(plugin, plugin_ini_list):
+  # Since this function is recursive, make sure we're not already in it.
+  if plugin.has_key('writing_status'):
+    if plugin['writing_status'] == 'done':
+      return
+    else:
+      print "Dependency loop detected with " % plugin['name']
+      exit(1)
+
+  plugin['writing_status'] = 'dependencies'
+
+  # Write all dependencies first to get around annoying automake bug
+  if plugin['dependency_list'] is not None:
+    for dependency in plugin['dependency_list']:
+      found = False
+      for find_plugin in plugin_ini_list:
+        if find_plugin['name'] == dependency:
+          found = True
+          write_plugin(find_plugin, plugin_ini_list)
+          break
+      if found is False:
+        print "Could not find dependency %s" % dependency
+        exit(1)
+
   write_plugin_ac(plugin, plugin_ac_file)
   write_plugin_am(plugin, plugin_am_file)
+  plugin['writing_status'] = 'done'
 
 def write_plugin_ac(plugin, plugin_ac):
   #
@@ -206,7 +215,7 @@
 dnl possible to disable it. Once it is disableable, we will make it non-static.
 with_%(name)s_plugin=yes
 pandora_builtin_list="_drizzled_%(name)s_plugin_,${pandora_builtin_list}"
-pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(pname)s.la"
+pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
 PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} %(plugin_dep_libs)s"
 
 """ % plugin)
@@ -281,23 +290,23 @@
     plugin_ac.write("      ])\n")
 
 
-def expand_plugin_ini(plugin, plugin_dir):
+def expand_plugin_ini(plugin):
     if plugin['name'] == "**OUT-OF-TREE**":
       print "Out of tree plugins require the name field to be specified in plugin.ini"
       sys.exit(1)
 
-    if plugin_dir == ".":
-      plugin['rel_path']= plugin_dir
+    if plugin['plugin_dir'] == ".":
+      plugin['rel_path']= plugin['plugin_dir']
       plugin['unconditional']=True
     else:
-      plugin['rel_path']= plugin_dir[len(top_srcdir)+len(os.path.sep):]
+      plugin['rel_path']= plugin['plugin_dir'][len(top_srcdir)+len(os.path.sep):]
       plugin['unconditional']=False
     # TODO: determine path to plugin dir relative to top_srcdir... append it to
     # source files if they don't already have it
     if plugin['sources'] == "":
       plugin['sources']="%s.cc" % plugin['name']
     new_sources=""
-    if plugin_dir != ".":
+    if plugin['plugin_dir'] != ".":
       for src in plugin['sources'].split():
         if not src.startswith(plugin['rel_path']):
           src= os.path.join(plugin['rel_path'], src)
@@ -309,7 +318,7 @@
     plugin['main_source']= plugin['sources'].split()[0]
     
     new_headers=""
-    if plugin_dir != ".":
+    if plugin['plugin_dir'] != ".":
       for header in plugin['headers'].split():
         if not header.startswith(plugin['rel_path']):
           header= os.path.join(plugin['rel_path'], header)
@@ -319,6 +328,17 @@
     if new_headers != "":
       plugin['headers']= new_headers
     
+    new_install_headers=""
+    if plugin['plugin_dir'] != ".":
+      for header in plugin['install_headers'].split():
+        if not header.startswith(plugin['rel_path']):
+          header= os.path.join(plugin['rel_path'], header)
+          new_install_headers= "%s %s" % (new_install_headers, header)
+    else:
+      new_install_headers= " ".join(plugin['install_headers'].split())
+    if new_install_headers != "":
+      plugin['install_headers']= new_install_headers
+    
     # Make a yes/no version for autoconf help messages
     if plugin['load_by_default']:
       plugin['default_yesno']="yes"
@@ -357,6 +377,7 @@
     plugin_file= os.path.join(plugin_dir,plugin_ini_fname)
     plugin_defaults= dict(sources="",
                           headers="",
+                          install_headers="",
                           cflags="",
                           cppflags="",
                           cxxflags="",
@@ -370,10 +391,13 @@
                           load_by_default="False",
                           disabled="False",
                           static="False",
+                          dependencies="",
+                          dependency_aliases="",
                           install=default_install)
     parser=ConfigParser.ConfigParser(defaults= plugin_defaults)
     parser.read(plugin_file)
     plugin=dict(parser.items('plugin'))
+    plugin['plugin_dir'] = plugin_dir
     if plugin_dir == '.':
       if not plugin.has_key('url'):
         print "External Plugins are required to specifiy a url"
@@ -412,12 +436,35 @@
     plugin['cppflags']+= extra_cppflags
     plugin['cxxflags']+= extra_cxxflags
 
-    plugin['pname']= "lib%s%s%s" % (plugin_prefix, plugin['name'], plugin_suffix)
+    plugin['libname']= "lib%s%s%s" % (plugin_prefix, plugin['name'], plugin_suffix)
+    if force_lowercase_libname:
+      plugin['libname']= plugin['libname'].lower()
+
     plugin['root_plugin_dir']= root_plugin_dir
     plugin['plugin_prefix']= plugin_prefix
     plugin['plugin_suffix']= plugin_suffix
     plugin['pkgplugindir']= pkgplugindir
 
+    # Dependencies must have a module but dependency aliases are simply added
+    # to the variable passed during compile.
+    plugin['dependencies'] = plugin['dependencies'].replace(' ', '')
+    plugin['dependency_aliases'] = plugin['dependency_aliases'].replace(' ', '')
+    if plugin['dependencies'] == '':
+      plugin['dependency_list'] = None
+      plugin['dependencies'] = plugin['dependency_aliases']
+    else:
+      plugin['dependency_list'] = plugin['dependencies'].split(',')
+      if plugin['dependency_aliases'] != '':
+        plugin['dependencies'] = ','.join([plugin['dependencies'], plugin['dependency_aliases']])
+
+# Libtool is going to expand:
+#      -DPANDORA_MODULE_AUTHOR='"Padraig O'"'"'Sullivan"'
+# to:
+# "-DPANDORA_MODULE_AUTHOR=\"Padraig O'Sullivan\""
+# So we have to replace internal ''s to '"'"'
+    for key in ('author','title','description','version'):
+      plugin[key]=plugin[key].replace('"','\\"')
+      plugin[key]=plugin[key].replace("'","'\"'\"'")
     return plugin
 
 
@@ -438,6 +485,8 @@
 """ % plugin)
   if plugin['headers'] != "":
     plugin_am.write("noinst_HEADERS += %(headers)s\n" % plugin)
+  if plugin['install_headers'] != "":
+    plugin_am.write("nobase_include_HEADERS += %(install_headers)s\n" % plugin)
   if plugin['testsuite']:
     if plugin.has_key('testsuitedir') and plugin['testsuitedir'] != "":
       plugin_am.write("EXTRA_DIST += %(rel_path)s/%(testsuitedir)s\n" % plugin)
@@ -446,16 +495,16 @@
 %(root_plugin_dir)s_%(plugin_prefix)s%(name)s_dir=${top_srcdir}/%(rel_path)s
 EXTRA_DIST += %(rel_path)s/plugin.ini
 if %(build_conditional_tag)s
-  noinst_LTLIBRARIES+=%(root_plugin_dir)s/%(pname)s.la
-  %(root_plugin_dir)s_%(pname)s_la_LIBADD=%(libs)s
-  %(root_plugin_dir)s_%(pname)s_la_DEPENDENCIES=%(libs)s
-  %(root_plugin_dir)s_%(pname)s_la_LDFLAGS=$(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
-  %(root_plugin_dir)s_%(pname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_MODULE_NAME=%(name)s -DPANDORA_MODULE_AUTHOR="%(author)s" -DPANDORA_MODULE_TITLE="%(title)s" -DPANDORA_MODULE_VERSION="%(version)s" -DPANDORA_MODULE_LICENSE=%(license)s %(cppflags)s
-  %(root_plugin_dir)s_%(pname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
-  %(root_plugin_dir)s_%(pname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+  noinst_LTLIBRARIES+=%(root_plugin_dir)s/%(libname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_LIBADD=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_DEPENDENCIES=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_LDFLAGS=$(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+  %(root_plugin_dir)s_%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_MODULE_NAME=%(name)s -DPANDORA_MODULE_AUTHOR='"%(author)s"' -DPANDORA_MODULE_TITLE='"%(title)s"' -DPANDORA_MODULE_VERSION='"%(version)s"' -DPANDORA_MODULE_LICENSE=%(license)s -DPANDORA_MODULE_DEPENDENCIES='"%(dependencies)s"' %(cppflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
 
-  %(root_plugin_dir)s_%(pname)s_la_SOURCES=%(sources)s
-  PANDORA_DYNAMIC_LDADDS+=${top_builddir}/%(root_plugin_dir)s/%(pname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_SOURCES=%(sources)s
+  PANDORA_DYNAMIC_LDADDS+=${top_builddir}/%(root_plugin_dir)s/%(libname)s.la
 endif
 """ % plugin)
   else:
@@ -463,15 +512,15 @@
 %(root_plugin_dir)s_%(plugin_prefix)s%(name)s_dir=${top_srcdir}/%(rel_path)s
 EXTRA_DIST += %(rel_path)s/plugin.ini
 if %(build_conditional_tag)s
-  %(library_type)s_LTLIBRARIES+=%(root_plugin_dir)s/%(pname)s.la
-  %(root_plugin_dir)s_%(pname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
-  %(root_plugin_dir)s_%(pname)s_la_LIBADD=%(libs)s
-  %(root_plugin_dir)s_%(pname)s_la_DEPENDENCIES=%(libs)s
-  %(root_plugin_dir)s_%(pname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(name)s -DPANDORA_MODULE_AUTHOR="%(author)s" -DPANDORA_MODULE_TITLE="%(title)s" -DPANDORA_MODULE_VERSION="%(version)s" -DPANDORA_MODULE_LICENSE=%(license)s %(cppflags)s
-  %(root_plugin_dir)s_%(pname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
-  %(root_plugin_dir)s_%(pname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+  %(library_type)s_LTLIBRARIES+=%(root_plugin_dir)s/%(libname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+  %(root_plugin_dir)s_%(libname)s_la_LIBADD=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_DEPENDENCIES=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(name)s -DPANDORA_MODULE_AUTHOR='"%(author)s"' -DPANDORA_MODULE_TITLE='"%(title)s"' -DPANDORA_MODULE_VERSION='"%(version)s"' -DPANDORA_MODULE_LICENSE=%(license)s -DPANDORA_MODULE_DEPENDENCIES='"%(dependencies)s"' %(cppflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
 
-  %(root_plugin_dir)s_%(pname)s_la_SOURCES=%(sources)s
+  %(root_plugin_dir)s_%(libname)s_la_SOURCES=%(sources)s
 endif
 """ % plugin)
   plugin_am_file=os.path.join(plugin['rel_path'],'plugin.am')
@@ -539,7 +588,8 @@
 EXTRA_DIST += \
 	config/pandora-plugin.am \
 	config/pandora-plugin.ac \
-	config/pandora-plugin
+	config/pandora-plugin \
+	config/pandora_plugin_config.py
 
 
 # Seed the list of plugin LDADDS which plugins may extend.
@@ -571,8 +621,16 @@
   for plugin_dir in plugin_list:
     plugin_am_file.write("\\\n\t%s/plugin.ini " % plugin_dir)
   plugin_am_file.write("\n\tcd ${top_srcdir} && python config/pandora-plugin write\n")
+  plugin_ini_list=[]
+
+  # Load all plugin.ini files first so we can do dependency tracking.
   for plugin_dir in plugin_list:
-    write_plugin(plugin_dir)
+    plugin = read_plugin_ini(plugin_dir)
+    expand_plugin_ini(plugin)
+    plugin_ini_list.append(plugin)
+
+  for plugin in plugin_ini_list:
+    write_plugin(plugin, plugin_ini_list)
 
 if plugin_am_file is not None:
   plugin_am_file.close()

=== added file 'config/pandora_plugin_config.py'
--- config/pandora_plugin_config.py	1970-01-01 00:00:00 +0000
+++ config/pandora_plugin_config.py	2010-04-16 20:59:24 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+
+#  Copyright (C) 2009 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
+
+top_srcdir='.'
+top_builddir='.'
+plugin_ini_fname='plugin.ini'
+plugin_list=[]
+plugin_am_file=None
+plugin_ac_file=None
+plugin_prefix=''
+plugin_suffix='_plugin'
+extra_cflags=''
+extra_cppflags=''
+extra_cxxflags=' -DBUILDING_DRIZZLE'
+root_plugin_dir='plugin'
+pkgplugindir='$(libdir)/drizzle'
+default_install='True'
+default_plugin_version=''
+force_lowercase_libname=True

=== modified file 'drizzled/data_home.h'
--- drizzled/data_home.h	2010-02-04 08:14:46 +0000
+++ drizzled/data_home.h	2010-04-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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/pthread_globals.h'
--- drizzled/pthread_globals.h	2010-02-04 08:14:46 +0000
+++ drizzled/pthread_globals.h	2010-04-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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/set_var.cc'
--- drizzled/set_var.cc	2010-04-07 15:56:28 +0000
+++ drizzled/set_var.cc	2010-04-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-01 15:54:57 +0000
+++ drizzled/sql_base.cc	2010-04-16 20:59:24 +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-16 20:59:24 +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/stacktrace.cc'
--- drizzled/stacktrace.cc	2010-02-04 08:14:46 +0000
+++ drizzled/stacktrace.cc	2010-04-16 20:59:24 +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-16 20:59:24 +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/table_identifier.cc'
--- drizzled/table_identifier.cc	2010-03-31 06:34:03 +0000
+++ drizzled/table_identifier.cc	2010-04-16 20:59:24 +0000
@@ -201,7 +201,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-16 20:59:24 +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 'm4/pandora_canonical.m4'
--- m4/pandora_canonical.m4	2010-04-01 17:45:30 +0000
+++ m4/pandora_canonical.m4	2010-04-16 20:59:24 +0000
@@ -4,7 +4,7 @@
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.118])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.121])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],

=== added file 'm4/pandora_have_libgtest.m4'
--- m4/pandora_have_libgtest.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libgtest.m4	2010-04-16 20:59:24 +0000
@@ -0,0 +1,44 @@
+dnl Copyright (C) 2010 Monty Taylor
+dnl This file is free software; Monty Taylor
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([_PANDORA_SEARCH_LIBGTEST],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libgtest
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libgtest],
+    [AS_HELP_STRING([--disable-libgtest],
+      [Build with libgtest support @<:@default=on@:>@])],
+    [ac_enable_libgtest="$enableval"],
+    [ac_enable_libgtest="yes"])
+
+  AS_IF([test "x$ac_enable_libgtest" = "xyes"],[
+    AC_LANG_PUSH(C++)
+    AC_LIB_HAVE_LINKFLAGS(gtest,,[
+      #include <gtest/gtest.h>
+TEST(pandora_test_libgtest, PandoraTest)
+{
+  ASSERT_EQ(1, 1);
+}
+    ],[])
+    AC_LANG_POP()
+  ],[
+    ac_cv_libgtest="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBGTEST, [test "x${ac_cv_libgtest}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBGTEST],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBGTEST],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST])
+  AS_IF([test "x${ac_cv_libgtest}" = "xno"],
+    AC_MSG_ERROR([libgtest is required for ${PACKAGE}]))
+])

=== modified file 'm4/pandora_have_libmemcached.m4'
--- m4/pandora_have_libmemcached.m4	2010-04-06 23:15:47 +0000
+++ m4/pandora_have_libmemcached.m4	2010-04-16 20:59:24 +0000
@@ -62,7 +62,7 @@
     ],[
       AS_IF([test "x$1" != "x"],[
         pandora_need_libmemcached_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d000", $[]1, $[]2 ;'`
-        AS_IF([test "x${pandora_need_libmemcached_version}" = "x00039000"],[
+        AS_IF([test "x${pandora_need_libmemcached_version}" = "x0000000"],[
           pandora_cv_recent_libmemcached=yes
         ],[
           AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

=== added file 'm4/pandora_have_sasl.m4'
--- m4/pandora_have_sasl.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_sasl.m4	2010-04-16 20:59:24 +0000
@@ -0,0 +1,133 @@
+dnl  Copyright (C) 2009 Sun Microsystems
+dnl This file is free software; Sun Microsystems
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([_PANDORA_SEARCH_SASL],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for sasl
+  dnl --------------------------------------------------------------------
+  AC_ARG_ENABLE([sasl],
+    [AS_HELP_STRING([--disable-sasl],
+      [Build with sasl support @<:@default=on@:>@])],
+    [ac_enable_sasl="$enableval"],
+    [ac_enable_sasl="yes"])
+
+  AS_IF([test "x$ac_enable_sasl" = "xyes"],
+    [
+      AC_LIB_HAVE_LINKFLAGS(sasl,,[
+        #include <stdlib.h>
+        #include <sasl/sasl.h>
+      ],[
+        sasl_server_init(NULL, NULL);
+      ])
+
+      AS_IF([test "x${ac_cv_libsasl}" != "xyes" ],
+            [
+              AC_LIB_HAVE_LINKFLAGS(sasl2,,[
+                #include <stdlib.h>
+                #include <sasl/sasl.h>
+              ],[
+                sasl_server_init(NULL, NULL);
+              ])
+              HAVE_LIBSASL="$HAVE_LIBSASL2"
+              LIBSASL="$LIBSASL2"
+              LIBSASL_PREFIX="$LIBSASL2_PREFIX"
+	      LTLIBSASL="$LT_LIBSASL2"
+            ])
+    ])
+
+  AS_IF([test "x${ac_cv_libsasl}" = "xyes" -o "x${ac_cv_libsasl2}" = "xyes"],
+        [ac_cv_sasl=yes],
+        [ac_cv_sasl=no])
+
+  AM_CONDITIONAL(HAVE_LIBSASL, [test "x${ac_cv_libsasl}" = "xyes"])
+  AM_CONDITIONAL(HAVE_LIBSASL2, [test "x${ac_cv_libsasl2}" = "xyes"])
+  AM_CONDITIONAL(HAVE_SASL, [test "x${ac_cv_sasl}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_SASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_SASL])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_SASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_SASL])
+  AS_IF([test "x${ac_cv_sasl}" = "xno"],
+    AC_MSG_ERROR([SASL (libsasl or libsasl2) is required for ${PACKAGE}]))
+])
+
+AC_DEFUN([_PANDORA_SEARCH_LIBSASL],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libsasl
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libsasl],
+    [AS_HELP_STRING([--disable-libsasl],
+      [Build with libsasl support @<:@default=on@:>@])],
+    [ac_enable_libsasl="$enableval"],
+    [ac_enable_libsasl="yes"])
+
+  AS_IF([test "x$ac_enable_libsasl" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(sasl,,[
+      #include <stdlib.h>
+      #include <sasl/sasl.h>
+    ],[
+      sasl_server_init(NULL, NULL);
+    ])
+  ],[
+    ac_cv_libsasl="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBSASL, [test "x${ac_cv_libsasl}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBSASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBSASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL])
+  AS_IF([test "x${ac_cv_libsasl}" = "xno"],
+    AC_MSG_ERROR([libsasl is required for ${PACKAGE}]))
+])
+
+AC_DEFUN([_PANDORA_SEARCH_LIBSASL2],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libsasl2
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libsasl2],
+    [AS_HELP_STRING([--disable-libsasl2],
+      [Build with libsasl2 support @<:@default=on@:>@])],
+    [ac_enable_libsasl2="$enableval"],
+    [ac_enable_libsasl2="yes"])
+
+  AS_IF([test "x$ac_enable_libsasl2" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(sasl2,,[
+      #include <stdlib.h>
+      #include <sasl2/sasl2.h>
+    ],[
+      sasl2_server_init(NULL, NULL);
+    ])
+  ],[
+    ac_cv_libsasl2="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBSASL2, [test "x${ac_cv_libsasl2}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBSASL2],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBSASL2],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2])
+  AS_IF([test "x${ac_cv_libsasl2}" = "xno"],
+    AC_MSG_ERROR([libsasl2 is required for ${PACKAGE}]))
+])

=== modified file 'm4/pandora_platform.m4'
--- m4/pandora_platform.m4	2010-01-02 04:53:48 +0000
+++ m4/pandora_platform.m4	2010-04-16 20:59:24 +0000
@@ -34,6 +34,8 @@
     ;;
   esac
 
+  PANDORA_OPTIMIZE_BITFIELD=1
+
   case "$target_os" in
     *linux*)
     TARGET_LINUX="true"
@@ -47,6 +49,7 @@
       ;;
     *solaris*)
       TARGET_SOLARIS="true"
+      PANDORA_OPTIMIZE_BITFIELD=0
       AC_SUBST(TARGET_SOLARIS)
       AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris])
       ;;
@@ -60,6 +63,8 @@
       ;;
   esac
 
+  AC_SUBST(PANDORA_OPTIMIZE_BITFIELD)
+
   AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
   AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])
 

=== modified file 'm4/pandora_warnings.m4'
--- m4/pandora_warnings.m4	2010-01-26 00:57:12 +0000
+++ m4/pandora_warnings.m4	2010-04-16 20:59:24 +0000
@@ -146,6 +146,8 @@
         BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing"
         CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum -Wwrite-strings"
         CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast"
+        NO_OLD_STYLE_CAST="-Wno-old-style-cast"
+        NO_EFF_CXX="-Wno-effc++"
       ],[
         BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}"
       ])
@@ -342,6 +344,8 @@
   AC_SUBST(NO_UNREACHED)
   AC_SUBST(NO_SHADOW)
   AC_SUBST(NO_STRICT_ALIASING)
+  AC_SUBST(NO_EFF_CXX)
+  AC_SUBST(NO_OLD_STYLE_CAST)
   AC_SUBST(PROTOSKIP_WARNINGS)
   AC_SUBST(INNOBASE_SKIP_WARNINGS)
   AC_SUBST(NO_WERROR)

=== 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-16 20:59:24 +0000
@@ -6418,6 +6418,7 @@
 /*==============*/
   uint flag)  /*!< in: what information MySQL requests */
 {
+<<<<<<< TREE
   dict_table_t* ib_table;
   dict_index_t* index;
   ha_rows   rec_per_key;
@@ -6609,6 +6610,199 @@
 
         if (j + 1 > index->n_uniq) {
           errmsg_printf(ERRMSG_LVL_ERROR, 
+=======
+	dict_table_t*	ib_table;
+	dict_index_t*	index;
+	ha_rows		rec_per_key;
+	ib_int64_t	n_rows;
+	ulong		j;
+	ulong		i;
+	char		path[FN_REFLEN];
+	os_file_stat_t	stat_info;
+
+	/* If we are forcing recovery at a high level, we will suppress
+	statistics calculation on tables, because that may crash the
+	server if an index is badly corrupted. */
+
+	if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {
+
+		/* We return success (0) instead of HA_ERR_CRASHED,
+		because we want MySQL to process this query and not
+		stop, like it would do if it received the error code
+		HA_ERR_CRASHED. */
+
+		return(0);
+	}
+
+	/* We do not know if MySQL can call this function before calling
+	external_lock(). To be safe, update the session of the current table
+	handle. */
+
+	update_session(ha_session());
+
+	/* In case MySQL calls this in the middle of a SELECT query, release
+	possible adaptive hash latch to avoid deadlocks of threads */
+
+	prebuilt->trx->op_info = (char*)"returning various info to MySQL";
+
+	trx_search_latch_release_if_reserved(prebuilt->trx);
+
+	ib_table = prebuilt->table;
+
+	if (flag & HA_STATUS_TIME) {
+		if (innobase_stats_on_metadata) {
+			/* In sql_show we call with this flag: update
+			then statistics so that they are up-to-date */
+
+			prebuilt->trx->op_info = "updating table statistics";
+
+			dict_update_statistics(ib_table);
+
+			prebuilt->trx->op_info = "returning various info to MySQL";
+		}
+
+		snprintf(path, sizeof(path), "%s/%s%s",
+			       data_home, ib_table->name, ".dfe");
+
+		internal::unpack_filename(path,path);
+
+		/* Note that we do not know the access time of the table,
+		nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
+
+		if (os_file_get_status(path,&stat_info)) {
+			stats.create_time = (ulong) stat_info.ctime;
+		}
+	}
+
+	if (flag & HA_STATUS_VARIABLE) {
+		n_rows = ib_table->stat_n_rows;
+
+		/* Because we do not protect stat_n_rows by any mutex in a
+		delete, it is theoretically possible that the value can be
+		smaller than zero! TODO: fix this race.
+
+		The MySQL optimizer seems to assume in a left join that n_rows
+		is an accurate estimate if it is zero. Of course, it is not,
+		since we do not have any locks on the rows yet at this phase.
+		Since SHOW TABLE STATUS seems to call this function with the
+		HA_STATUS_TIME flag set, while the left join optimizer does not
+		set that flag, we add one to a zero value if the flag is not
+		set. That way SHOW TABLE STATUS will show the best estimate,
+		while the optimizer never sees the table empty. */
+
+		if (n_rows < 0) {
+			n_rows = 0;
+		}
+
+		if (n_rows == 0 && !(flag & HA_STATUS_TIME)) {
+			n_rows++;
+		}
+
+		/* Fix bug#40386: Not flushing query cache after truncate.
+		n_rows can not be 0 unless the table is empty, set to 1
+		instead. The original problem of bug#29507 is actually
+		fixed in the server code. */
+		if (session_sql_command(user_session) == SQLCOM_TRUNCATE) {
+
+			n_rows = 1;
+
+			/* We need to reset the prebuilt value too, otherwise
+			checks for values greater than the last value written
+			to the table will fail and the autoinc counter will
+			not be updated. This will force write_row() into
+			attempting an update of the table's AUTOINC counter. */
+
+			prebuilt->autoinc_last_value = 0;
+		}
+
+		stats.records = (ha_rows)n_rows;
+		stats.deleted = 0;
+		stats.data_file_length = ((uint64_t)
+				ib_table->stat_clustered_index_size)
+					* UNIV_PAGE_SIZE;
+		stats.index_file_length = ((uint64_t)
+				ib_table->stat_sum_of_other_index_sizes)
+					* UNIV_PAGE_SIZE;
+
+		/* Since fsp_get_available_space_in_free_extents() is
+		acquiring latches inside InnoDB, we do not call it if we
+		are asked by MySQL to avoid locking. Another reason to
+		avoid the call is that it uses quite a lot of CPU.
+		See Bug#38185.
+		We do not update delete_length if no locking is requested
+		so the "old" value can remain. delete_length is initialized
+		to 0 in the ha_statistics' constructor. */
+		if (!(flag & HA_STATUS_NO_LOCK)) {
+
+			/* lock the data dictionary to avoid races with
+			ibd_file_missing and tablespace_discarded */
+			row_mysql_lock_data_dictionary(prebuilt->trx);
+
+			/* ib_table->space must be an existent tablespace */
+			if (!ib_table->ibd_file_missing
+			    && !ib_table->tablespace_discarded) {
+
+				stats.delete_length =
+					fsp_get_available_space_in_free_extents(
+						ib_table->space) * 1024;
+			} else {
+
+				Session*	session;
+
+				session = ha_session();
+
+				push_warning_printf(
+					session,
+					DRIZZLE_ERROR::WARN_LEVEL_WARN,
+					ER_CANT_GET_STAT,
+					"InnoDB: Trying to get the free "
+					"space for table %s but its "
+					"tablespace has been discarded or "
+					"the .ibd file is missing. Setting "
+					"the free space to zero.",
+					ib_table->name);
+
+				stats.delete_length = 0;
+			}
+
+			row_mysql_unlock_data_dictionary(prebuilt->trx);
+		}
+
+		stats.check_time = 0;
+
+		if (stats.records == 0) {
+			stats.mean_rec_length = 0;
+		} else {
+			stats.mean_rec_length = (ulong) (stats.data_file_length / stats.records);
+		}
+	}
+
+	if (flag & HA_STATUS_CONST) {
+		index = dict_table_get_first_index(ib_table);
+
+		if (prebuilt->clust_index_was_generated) {
+			index = dict_table_get_next_index(index);
+		}
+
+		for (i = 0; i < table->s->keys; i++) {
+			if (index == NULL) {
+				errmsg_printf(ERRMSG_LVL_ERROR, "Table %s contains fewer "
+						"indexes inside InnoDB than "
+						"are defined in the MySQL "
+						".frm file. Have you mixed up "
+						".frm files from different "
+						"installations? See "
+						REFMAN
+						"innodb-troubleshooting.html\n",
+						ib_table->name);
+				break;
+			}
+
+			for (j = 0; j < table->key_info[i].key_parts; j++) {
+
+				if (j + 1 > index->n_uniq) {
+					errmsg_printf(ERRMSG_LVL_ERROR, 
+>>>>>>> MERGE-SOURCE
 "Index %s of %s has %lu columns unique inside InnoDB, but MySQL is asking "
 "statistics for %lu columns. Have you mixed up .frm files from different "
 "installations? "

=== modified file 'plugin/myisam/plugin.ini'
--- plugin/myisam/plugin.ini	2010-02-04 08:14:46 +0000
+++ plugin/myisam/plugin.ini	2010-04-16 20:59:24 +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/myxt_xt.cc'
--- plugin/pbxt/src/myxt_xt.cc	2010-04-14 16:29:40 +0000
+++ plugin/pbxt/src/myxt_xt.cc	2010-04-16 20:59:24 +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/xt_defs.h'
--- plugin/pbxt/src/xt_defs.h	2010-04-08 16:11:29 +0000
+++ plugin/pbxt/src/xt_defs.h	2010-04-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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-16 20:59:24 +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/include.am'
--- tests/include.am	2010-02-26 16:55:54 +0000
+++ tests/include.am	2010-04-16 20:59:24 +0000
@@ -52,7 +52,7 @@
 	${srcdir}/tests/lib/*.pl \
 	${srcdir}/tests/lib/My/*.pm
 
-check: test-drizzle
+check-local: test-drizzle
 
 # dtr - a shortcut for executing test-run.pl
 tests/dtr:
@@ -86,7 +86,7 @@
 # will then calculate the various port numbers it needs from this,
 # making sure each user use different ports.
 
-test: test-drizzle
+test: check
 
 # Please keep the list of tests in alphabetical order for ease of
 # maintenance and verification

=== modified file 'tests/test-run.pl'
--- tests/test-run.pl	2010-03-31 18:10:36 +0000
+++ tests/test-run.pl	2010-04-16 20:59:24 +0000
@@ -3337,10 +3337,12 @@
     # 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");
   }
 

=== modified file 'tests/valgrind.supp'
--- tests/valgrind.supp	2010-04-10 07:22:33 +0000
+++ tests/valgrind.supp	2010-04-16 20:59:24 +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
    ...