diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-08-31 13:07:44 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-08-31 13:07:44 +0200 |
| commit | 12ca48990ef611ecd257169c09899602eda85d4e (patch) | |
| tree | 689ce2725515d4e3c828f044077c3d2cf7d07d26 /storage | |
| parent | 2fd4f480ef3ff1c66497d64aa2f12aef6ffd3561 (diff) | |
| download | mariadb-git-12ca48990ef611ecd257169c09899602eda85d4e.tar.gz | |
PBXT merge fixes.
- Disable PBMS in MariaDB (as per recommendation of Paul).
- Add missing *-master.opt files to make testsuite work on case-sensitive file systems.
- Result file updates.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/pbxt/src/Makefile.am | 4 | ||||
| -rw-r--r-- | storage/pbxt/src/xt_config.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/pbxt/src/Makefile.am b/storage/pbxt/src/Makefile.am index 2272fe81464..10dc5905964 100644 --- a/storage/pbxt/src/Makefile.am +++ b/storage/pbxt/src/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \ datadic_xt.h datalog_xt.h filesys_xt.h hashtab_xt.h \ ha_pbxt.h heap_xt.h index_xt.h linklist_xt.h \ memory_xt.h myxt_xt.h pthread_xt.h restart_xt.h \ - streaming_xt.h sortedlist_xt.h strutil_xt.h \ + pbms_enabled.h sortedlist_xt.h strutil_xt.h \ tabcache_xt.h table_xt.h trace_xt.h thread_xt.h \ util_xt.h xaction_xt.h xactlog_xt.h lock_xt.h \ systab_xt.h ha_xtsys.h discover_xt.h \ @@ -30,7 +30,7 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \ datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \ ha_pbxt.cc heap_xt.cc index_xt.cc linklist_xt.cc \ memory_xt.cc myxt_xt.cc pthread_xt.cc restart_xt.cc \ - streaming_xt.cc sortedlist_xt.cc strutil_xt.cc \ + pbms_enabled.cc sortedlist_xt.cc strutil_xt.cc \ tabcache_xt.cc table_xt.cc trace_xt.cc thread_xt.cc \ systab_xt.cc ha_xtsys.cc discover_xt.cc \ util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc diff --git a/storage/pbxt/src/xt_config.h b/storage/pbxt/src/xt_config.h index 4392ec7a578..399789da043 100644 --- a/storage/pbxt/src/xt_config.h +++ b/storage/pbxt/src/xt_config.h @@ -81,7 +81,8 @@ const int max_connections = 500; #define DEBUG #endif // _DEBUG #else -#define PBMS_ENABLED +// Paul suggested to disable PBMS in MariaDB for now. +// #define PBMS_ENABLED #endif #ifdef __FreeBSD__ |