diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-12 17:27:18 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-12 17:27:18 +0300 |
| commit | 8b2abdcf41da724c3685be85611ace237f085374 (patch) | |
| tree | bd034274b6b4129c0a5883fc1bcd358a449df207 /storage/pbxt/src | |
| parent | f6615e4898cc8b611b9c398731d69d141345dffb (diff) | |
| parent | 6248c89a4bfc66c7f9319f406bee08dc39ef5378 (diff) | |
| download | mariadb-git-8b2abdcf41da724c3685be85611ace237f085374.tar.gz | |
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
Diffstat (limited to 'storage/pbxt/src')
| -rw-r--r-- | storage/pbxt/src/ha_pbxt.cc | 1 | ||||
| -rw-r--r-- | storage/pbxt/src/myxt_xt.cc | 1 | ||||
| -rw-r--r-- | storage/pbxt/src/xt_config.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/storage/pbxt/src/ha_pbxt.cc b/storage/pbxt/src/ha_pbxt.cc index 8d89b86904c..8ea6494240e 100644 --- a/storage/pbxt/src/ha_pbxt.cc +++ b/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 diff --git a/storage/pbxt/src/myxt_xt.cc b/storage/pbxt/src/myxt_xt.cc index 18c8d5fee78..51490fc00f5 100644 --- a/storage/pbxt/src/myxt_xt.cc +++ b/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); diff --git a/storage/pbxt/src/xt_config.h b/storage/pbxt/src/xt_config.h index f3749071087..cb3009ecb79 100644 --- a/storage/pbxt/src/xt_config.h +++ b/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 |