diff options
| author | Vladimir Kolesnikov <vladimir@primebase.org> | 2009-12-09 22:39:23 +0100 |
|---|---|---|
| committer | Vladimir Kolesnikov <vladimir@primebase.org> | 2009-12-09 22:39:23 +0100 |
| commit | 8bc8de1ad3da108d741417f43ac40df771a66d1e (patch) | |
| tree | a03d76f2783945d3b3f0b44647b5c11039721d0b /storage | |
| parent | 06fb006a1de2ca55b72bc81107531947082b3bac (diff) | |
| download | mariadb-git-8bc8de1ad3da108d741417f43ac40df771a66d1e.tar.gz | |
fixed bug #439889: Embedded server asserts on startup because of pbxt
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/pbxt/plug.in | 1 | ||||
| -rw-r--r-- | storage/pbxt/src/Makefile.am | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/storage/pbxt/plug.in b/storage/pbxt/plug.in index 67a8e7b0ac9..02c5d8adcbe 100644 --- a/storage/pbxt/plug.in +++ b/storage/pbxt/plug.in @@ -5,3 +5,4 @@ MYSQL_PLUGIN_STATIC(pbxt, [src/libpbxt.a]) MYSQL_PLUGIN_ACTIONS(pbxt, [ # AC_CONFIG_FILES(storage/pbxt/src/Makefile) ]) +MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(pbxt, [[src/ha_pbxt.cc],[src/myxt_xt.cc],[src/discover_xt.cc]]) diff --git a/storage/pbxt/src/Makefile.am b/storage/pbxt/src/Makefile.am index a09d8f0a57b..8b8add48aa5 100644 --- a/storage/pbxt/src/Makefile.am +++ b/storage/pbxt/src/Makefile.am @@ -46,7 +46,5 @@ libpbxt_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99 EXTRA_LIBRARIES = libpbxt.a noinst_LIBRARIES = libpbxt.a libpbxt_a_SOURCES = $(libpbxt_la_SOURCES) -libpbxt_a_CXXFLAGS = $(AM_CXXFLAGS) -libpbxt_a_CFLAGS = $(AM_CFLAGS) -std=c99 EXTRA_DIST = pbms_enabled.cc win_inttypes.h |