diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-23 11:22:56 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-23 11:22:56 +0200 |
| commit | 1c23091c4ecc23100a6fe42288819cf4d5dc0b5b (patch) | |
| tree | db09f3c0fa94cc3151b0b50e57008e361608aa98 /storage/federatedx | |
| parent | e079f3c84a24e67f2da3ae0b0c338d5b79dc9516 (diff) | |
| download | mariadb-git-1c23091c4ecc23100a6fe42288819cf4d5dc0b5b.tar.gz | |
Fixed build failures
- Removed references to deleted files
- If we link staticly, check for static zlib
- This should fix the problem with 'no -lz found' link error
- Fixed build failure on window (Patch from Wlad)
- Fixed build problem with federatedx when using -Werror
BUILD/Makefile.am:
Remove removed file
config/ac-macros/zlib.m4:
If we compile with --all-static, test that we have a static libz
libmysqld/CMakeLists.txt:
Fix for build error on windows
mysql-test/suite/pbxt/r/key_cache.result:
Updated result
mysql-test/suite/pbxt/t/key_cache.test:
Fixed not updated test case
sql/CMakeLists.txt:
Fix for build error on windows
storage/federatedx/Makefile.am:
Don't use CFLAGS to compile C++ programs
storage/pbxt/src/lock_xt.cc:
Fixed compiler warning about using uninitialized b2
storage/xtradb/buf/buf0buf.c:
Fixed wrong printf
storage/xtradb/srv/srv0srv.c:
Fixed assignment of different width and test with different sign/unsigned
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am index 9ce0e4fe0f9..9296e9e00ea 100644 --- a/storage/federatedx/Makefile.am +++ b/storage/federatedx/Makefile.am @@ -21,23 +21,19 @@ EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embed pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_federatedx_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN noinst_LTLIBRARIES = @plugin_federatedx_static_target@ @plugin_federatedx_embedded_static_target@ libfederatedx_common_la_CXXFLAGS = $(AM_CXXFLAGS) -libfederatedx_common_la_CFLAGS = $(AM_CFLAGS) libfederatedx_common_la_SOURCES= federatedx_txn.cc \ federatedx_io.cc federatedx_io_null.cc \ federatedx_io_mysql.cc -libfederatedx_la_CXXFLAGS = $(AM_CFLAGS) -libfederatedx_la_CFLAGS = $(AM_CFLAGS) +libfederatedx_la_CXXFLAGS = $(AM_CXXFLAGS) libfederatedx_la_LIBADD = libfederatedx_common.la libfederatedx_la_SOURCES= ha_federatedx.cc -libfederatedx_embedded_la_CXXFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@ -libfederatedx_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@ +libfederatedx_embedded_la_CXXFLAGS = $(AM_CXXCFLAGS) @plugin_embedded_defs@ libfederatedx_embedded_la_LDFLAGS = $(AM_LDFLAGS) libfederatedx_embedded_la_LIBADD = libfederatedx_common.la libfederatedx_embedded_la_SOURCES= ha_federatedx.cc |