diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-10 23:02:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-10 23:02:25 +0200 |
| commit | 62643f81e6749913cdd250ec0db9529968addc50 (patch) | |
| tree | 5deb1fbf586ee4cd46e02914cd65f1d23c7ac3f5 /sql/sql_plugin.cc | |
| parent | 0e1070125f8fb2ffeba985345b001b3ca436bd44 (diff) | |
| parent | 265bbf5fe172f1ccb68d2b9c1da93dc7ad1c6cee (diff) | |
| download | mariadb-git-62643f81e6749913cdd250ec0db9529968addc50.tar.gz | |
merge with 5.5-tokudb tree. In particular:
* add TokuDB, together with the ft-index library
* cmake support, auto-detecting whether tokudb can be built
* fix packaging - tokudb-engine.rpm, deb
* remove PBXT
* add jemalloc
* the server is built with jemalloc by default even if TokuDB is not built
* documentation files in RPM are installed in the correct location
* support for optional deb packages (tokudb has specific build requirements)
* move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient)
* correct mariadb-test.deb to be not architecture-independent
* fix out-of-tree builds to never modify in-tree files
* new handler::prepare_index_scan() method
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index c3d201c2cca..eb8b05a9c99 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -176,8 +176,7 @@ static struct /* we disable few other plugins by default */ { "ndbcluster", PLUGIN_OFF }, - { "feedback", PLUGIN_OFF }, - { "pbxt", PLUGIN_OFF } + { "feedback", PLUGIN_OFF } }; /* support for Services */ |