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 /support-files | |
| 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 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 14 |
2 files changed, 3 insertions, 17 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index fde4746df16..1909c1760d9 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -105,11 +105,11 @@ IF(UNIX) INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} COMPONENT Common) - INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT SharedLibraries) - INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT Client) - INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT IniFiles) # This is for SuSE: diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index edccc6e5975..cd39b3f7a9d 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -132,25 +132,11 @@ signal\.c : .*unused parameter.* storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used # -# Pbxt -# -xaction_xt\.cc: may be used uninitialized in this function -lock_xt\.cc : uninitialized local variable .* used -restart_xt\.cc : dereferencing pointer .* does break strict-aliasing - -# # oqgraph errors that are hard to fix # oqgraph/graphcore\.cc : may be used uninitialized in this function # -# I think these are due to mix of C and C++. -# -storage/pbxt/ : typedef.*was ignored in this declaration -ha_pbxt\.cc : variable.*might be clobbered by.*longjmp -table_xt\.cc : variable.*might be clobbered by.*longjmp - -# # Yassl # include/runtime.hpp: .*pure_error.* |