diff options
| author | Hakan Kuecuekyilmaz <hakan@askmonty.org> | 2009-11-01 18:41:16 +0100 |
|---|---|---|
| committer | Hakan Kuecuekyilmaz <hakan@askmonty.org> | 2009-11-01 18:41:16 +0100 |
| commit | 578f4b651e07a213efabb15715e6209bef97be5f (patch) | |
| tree | 2db2fa498e1425d268768bf8fdca328167fdcd05 /storage/federatedx | |
| parent | 6cabc7abb8469e6649c68f0608361ba45814fdca (diff) | |
| parent | 10aeefce5624276c2eefb0003f4421467b88e06b (diff) | |
| download | mariadb-git-578f4b651e07a213efabb15715e6209bef97be5f.tar.gz | |
Merge.
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/CMakeLists.txt (renamed from storage/federatedx/CMakeFiles.txt) | 0 | ||||
| -rw-r--r-- | storage/federatedx/Makefile.am | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/storage/federatedx/CMakeFiles.txt b/storage/federatedx/CMakeLists.txt index 897fc174505..897fc174505 100644 --- a/storage/federatedx/CMakeFiles.txt +++ b/storage/federatedx/CMakeLists.txt diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am index 802f89d2321..6dbeff1207a 100644 --- a/storage/federatedx/Makefile.am +++ b/storage/federatedx/Makefile.am @@ -34,7 +34,7 @@ libfederatedx_a_SOURCES= ha_federatedx.cc federatedx_txn.cc \ federatedx_io_mysql.cc EXTRA_DIST = CMakeLists.txt plug.in ha_federatedx.h \ - federatedx_probes.d + federatedx_probes.h ha_federatedx_la_SOURCES = ha_federatedx.cc federatedx_txn.cc \ federatedx_io.cc federatedx_io_null.cc \ |