diff options
author | Michael Widenius <monty@askmonty.org> | 2009-10-30 20:50:56 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2009-10-30 20:50:56 +0200 |
commit | 226f0c7601a7bc3d0274d0b7aa6523743856cf11 (patch) | |
tree | 35ea9501b4c40098ed9b57b42d44aa35d912dea7 /libmysqld | |
parent | 664fa25e0e40457f2374f4372fca9a631d039c8c (diff) | |
download | mariadb-git-226f0c7601a7bc3d0274d0b7aa6523743856cf11.tar.gz |
Added federatedx storage engine
Fixed compiler warnings
client/mysqladmin.cc:
Fixed compiler warning
extra/yassl/taocrypt/src/twofish.cpp:
Fixed compiler warning
libmysqld/Makefile.am:
Use federatedx instead of federated
(Should actually be removed)
mysql-test/mysql-test-run.pl:
Fixed warning
mysql-test/valgrind.supp:
Removed warning found on 64 bit Linux machine
storage/pbxt/src/cache_xt.cc:
Fixed compile warning
storage/xtradb/include/buf0buf.ic:
Fixed compiler warning
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index d1dacbaec0c..ecf45a23399 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -124,7 +124,7 @@ handler.o: handler.cc # found to append fileslists that collected by configure # to the sources list -ha_federated.o:ha_federated.cc +ha_federatedx.o:ha_federatedx.cc $(CXXCOMPILE) $(LM_CFLAGS) -c $< ha_heap.o:ha_heap.cc |