Merge to get PBXT's xstat program

scripts/make_binary_distribution.sh:
  Added copying of xstat
scripts/make_win_bin_dist:
  Added copying of xstat

scripts/make_binary_distribution.sh

@@ -276,6 +276,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
   # Do a install that we later are to pack. Use the same paths as in
   # the build for the relevant directories.
   # ----------------------------------------------------------------------
+  set -x -v
   @MAKE@ DESTDIR=$BASE install \
     pkglibdir=@pkglibdir@ \
     pkgincludedir=@pkgincludedir@ \
@@ -444,6 +445,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
   tests/mysql_client_test$BS \
   libmysqld/examples/mysql_client_test_embedded$BS \
   libmysqld/examples/mysqltest_embedded$BS \
+  storage/pbxt/bin/xtstat$BS \
   ";
 
 # Platform-specific bin dir files:

scripts/make_win_bin_dist

@@ -158,6 +158,11 @@ for eng in $MARIA_BINARIES ; do
   cp storage/maria/$TARGET/$eng.{exe,pdb} $DESTDIR/bin
 done
 
+# PBXT
+if [ -f "storage/pbxt/bin/xtstat.exe" ] ; then
+  cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin
+fi
+
 cp server-tools/instance-manager/$TARGET/*.{exe,map}     $DESTDIR/bin/
 if [ x"$TARGET" != x"release" ] ; then
   cp server-tools/instance-manager/$TARGET/*.pdb         $DESTDIR/bin/

storage/pbxt/Makefile.am

-SUBDIRS = src
+SUBDIRS = src bin
 
 EXTRA_DIST = CMakeLists.txt plug.in

storage/pbxt/bin/Makefile.am

+# Used to build Makefile.in
+
+INCLUDES =	-I$(top_srcdir)/include -I$(top_builddir)/include \
+			-I$(top_srcdir)/regex \
+			-I$(top_srcdir)/storage/innobase/include \
+			-I$(top_srcdir)/sql \
+			-I$(srcdir) \
+			-I../src
+
+bin_PROGRAMS =		xtstat
+
+xtstat_SOURCES =	xtstat_xt.cc ../src/strutil_xt.cc
+
+xtstat_LDADD =		$(top_srcdir)/libmysql/libmysqlclient.la

storage/pbxt/src/ha_pbxt.cc

@@ -80,6 +80,7 @@ using drizzled::plugin::InfoSchemaMethods;
 #include "systab_xt.h"
 #include "xaction_xt.h"
 #include "backup_xt.h"
+#include "heap_xt.h"
 
 #ifdef DEBUG
 //#define XT_USE_SYS_PAR_DEBUG_SIZES

storage/pbxt/src/myxt_xt.cc

@@ -54,6 +54,7 @@ extern pthread_key_t THR_Session;
 #include "database_xt.h"
 #include "cache_xt.h"
 #include "datalog_xt.h"
+#include "memory_xt.h"
 
 static void		myxt_bitmap_init(XTThreadPtr self, MX_BITMAP *map, u_int n_bits);
 static void		myxt_bitmap_free(XTThreadPtr self, MX_BITMAP *map);

storage/pbxt/src/xt_config.h

@@ -128,4 +128,8 @@ const int max_connections = 500;
 #endif
 #endif
 
+#if defined(DBUG_ON) && !defined(DBUG_OFF) && !defined(DEBUG)
+#define DEBUG
+#endif // DBUG_ON
+
 #endif