diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-04-25 17:12:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-04-25 17:12:52 +0400 |
| commit | bc80fb07ded7abcfb99d368d14e4c5e81a669101 (patch) | |
| tree | 4ad02b3ecbc9d357c7d6a18c55e97103da1d0eb4 /storage/cassandra/gen-cpp | |
| parent | 616e7a7466d2a9bceec9b2c968ce5cbf8035eba4 (diff) | |
| download | mariadb-git-bc80fb07ded7abcfb99d368d14e4c5e81a669101.tar.gz | |
ha_cassandra.so and ha_oqgraph.so can be build only if boost is installed
on the build machine. So put them into the deb packages optionally.
Additionally, fixing cassandra/CMakeLists.txt to work with thrift
installed in /opt/local and /opt. It was supposed to work, but did
not work actually. Only thrift installed in /usr or /usr/local worked.
renamed:
debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in
debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in
modified:
.bzrignore
CMakeLists.txt
storage/cassandra/CMakeLists.txt
storage/cassandra/cassandra_se.cc
storage/cassandra/gen-cpp/Cassandra.h
storage/cassandra/gen-cpp/cassandra_types.h
storage/oqgraph/CMakeLists.txt
debian/dist/Debian/mariadb-server-10.0.files.in
debian/dist/Ubuntu/mariadb-server-10.0.files.in
Diffstat (limited to 'storage/cassandra/gen-cpp')
| -rw-r--r-- | storage/cassandra/gen-cpp/Cassandra.h | 2 | ||||
| -rw-r--r-- | storage/cassandra/gen-cpp/cassandra_types.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/cassandra/gen-cpp/Cassandra.h b/storage/cassandra/gen-cpp/Cassandra.h index 2040cc63aa2..b98570043a9 100644 --- a/storage/cassandra/gen-cpp/Cassandra.h +++ b/storage/cassandra/gen-cpp/Cassandra.h @@ -7,7 +7,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/storage/cassandra/gen-cpp/cassandra_types.h b/storage/cassandra/gen-cpp/cassandra_types.h index d675198dcc8..226c5fa570a 100644 --- a/storage/cassandra/gen-cpp/cassandra_types.h +++ b/storage/cassandra/gen-cpp/cassandra_types.h @@ -10,10 +10,10 @@ #include <inttypes.h> #include <netinet/in.h> -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> |