summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-187-13/+108
|\
| * Fixed jemalloc with ccache build failure.Sergey Vojtovich2013-09-171-1/+1
| |
| * merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-106-11/+106
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * introduce sysconf2dir, install tokudb.conf there, both in rpm and debSergei Golubchik2013-09-102-6/+9
| | |
| | * INSTALL_DOCUMENTATION function for CMakeLists.txtSergei Golubchik2013-09-103-4/+43
| | | | | | | | | | | | It puts files in the correct location for rpm/deb packages.
| | * * mariadb-tokudb-engine-5.5.debSergei Golubchik2013-09-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | * now only production-use server plugins are in mariadb-server. client plugins are now in libmariadbclient18, testing-only server plugins are now in mariadb-test (set Coflicts: field properly) * fix Architecture: of mariadb-test * terrible hack to support optional deb packages for optional plugins
| | * MariaDB-tokudb-engine.rpmSergei Golubchik2013-09-091-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | cmake/plugin.cmake: * auto-create an rpm for a plugin, if it places itself in a new component storage/tokudb/CMakeLists.txt: install tokudb in COMPONENT tokudb-engine. this automatically creates a separate rpm for it.
| | * fixes for buildbotSergei Golubchik2013-09-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disable jemalloc on windows (cannot run ./configure) * disable jemalloc on ancient cmake (ExternalProject does not work) * rewrite TokuDB compiler test to check for features, not versions (to work on cmake before 2.8.11) * fix ft-index to not add VALGRIND_INCLUDE_DIR to includes, if no valgrind was found * correct the package name in FindValgrind.cmake (for find_package(... REQUIRED) to work) * disable ft-index tests by default (faster compilation and they aren't used anyway) * don't build ft-index with valgrind by default (otherwise it *requires* valgrind, it doesn't auto-detect) * use --loose-tokudb in the .opt file
| | * fixes for out-of-source buildsSergei Golubchik2013-09-091-1/+1
| | | | | | | | | | | | | | | | | | mysql-test/CMakeLists.txt: don't generate collection fules. we don't use them and they break out-of-source builds
| | * cmake fixes for tokudbSergei Golubchik2013-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake/jemalloc.cmake: for dependencies to work, LIBJEMALLOC should be the target name, not the path storage/tokudb/CMakeLists.txt: * check the preconditions * disable bdb tests (compilation errors) * set variable, instead of SET_PROPERTY. same effect, but doesn't fail when a plugin is disabled (that is, a target does not exist) storage/tokudb/ft-index/CMakeLists.txt: cmake should not look into examples/ directory, there is hand-crafted examples/Makefile that cmake will overwrite storage/tokudb/ft-index/buildheader/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/cmake_modules/TokuMergeLibs.cmake: Libraries must be specified in the specific order, REMOVE_DUPLICATES cannot be used, because it destroys this order. (when OSLIBS contains "-lpthread -ljemalloc -lpthread", REMOVE_DUPLICATES makes it "-lpthread -ljemalloc". But a thread library *must* be *after* jemalloc) storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake: * 'which' might print errors to stderr, they are not important, shut them up * we don't have TOKUDB_DATA, no need to warn about it * don't configure_file into itself (with input=output) storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake: jemalloc is built externally to tokudb/ft-index storage/tokudb/ft-index/ft/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/ft/tests/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/locktree/tests/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/portability/CMakeLists.txt: s/jemalloc/libjemalloc/ storage/tokudb/ft-index/portability/os_malloc.cc: unnecessary include file storage/tokudb/ft-index/portability/tests/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/src/tests/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/util/tests/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name storage/tokudb/ft-index/utils/CMakeLists.txt: the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
| | * start using jemallocSergei Golubchik2013-08-301-0/+33
| | |
| * | mysql-5.5.33 mergeSergei Golubchik2013-09-061-2/+2
| |\ \ | | |/ | |/|
| | * Bug#16945503 ADDRESSSANITIZER BUG IN SYS_VARSTor Didriksen2013-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sys_var_keycache inherits from some variant of Sys_var_integer Instances of Sys_var_keycache are initialized using the KEYCACHE_VAR macro, which takes an offset within st_key_cache. However, the Sys_var_integer CTOR treats the offset as if it was within global_system_variables (hidden within some layers of macros and fuction pointers) The result is that we write arbitrary data to arbitrary locations in memory. This all happens during static initialization of global objects, i.e. before we have even entered the main() function. Bug#12325449 TYPO IN CMAKE/DTRACE.CMAKE Fix typo in dtrace.cmake
* | | 5.5 mergeSergei Golubchik2013-07-173-13/+18
|\ \ \ | |/ /
| * | mysql-5.5.32 mergeSergei Golubchik2013-07-161-11/+14
| |\ \ | | |/
| | * Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPETor Didriksen2013-03-011-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Don't use CMAKE_OSX_ARCHITECTURES to determine DEFAULT_MACHINE if it is not defined. If we're 64bit, then use "x86_64" rather than "x86"
| * | MDEV-4601 : Allow MariaDB to be build without non-blocking client.Vladislav Vaintroub2013-06-151-0/+2
| | | | | | | | | | | | | | | Non-blocking client currently can be build on Windows, GCC on i386 and x64, or any OS wth ucontext.h header. Prior to this patch, build failed if neither of these conditions is true. Fix to avoid compiler errors in these case - non-blocking API would not be useful on , but otherwise everything will work as before.
| * | - Added -Wno-uninitialized to avoid warnings in release buildsMichael Widenius2013-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (uninitalized variables are detected by DBUG builds) - Fixed wrong declaration which cased compile failure on 32 bit cmake/build_configurations/mysql_release.cmake: Added -Wno-uninitialized to avoid warnings in release builds (uninitalized variables are detected by DBUG builds) include/maria.h: Fixed wrong declaration which cased compile failure on 32 bit include/myisam.h: Fixed wrong declaration which cased compile failure on 32 bit
* | | Fix to compile without partitioning.Sergei Golubchik2013-06-151-1/+2
| | | | | | | | | | | | Remove few ifdef's
* | | 5.5 mergeSergei Golubchik2013-06-0612-28/+38
|\ \ \ | |/ /
| * | MDEV-4607 : libreadline-related compilation problems on NetBSD.Vladislav Vaintroub2013-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Problem : libreadline.so was already present on the machine, however the cmake check NEW_READLINE_INTERFACE was unsuccessfull indicating, thus bundled library had to be used instead of system library. The problem was that the value for HAVE_HIST_ENTRY cmake variable was cached with incorrect value (1 on NetBSD). The fix is to change HAVE_HIST_ENTRY to 0 with CACHE FORCE, after switching to bundled readline.
| * | followup for revision 3751 "centos5 gcc 4.1 asm bug"Sergei Golubchik2013-05-281-6/+0
| | | | | | | | | | | | remove the workaround from cmake/os/FreeBSD.cmake
| * | MDEV-4199 Installing postfix on CentOS 5.9 requires MariaDB-serverSergei Golubchik2013-05-131-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | to match distribution packages better: remove "mysql" from server.rpm Provides, add it to the shared.rpm Provides. fake provides that "mysql" and "mysql-libs" packages would've had. cleanup: remove auto-generated provides from the manual provides list.
| * | centos5 gcc 4.1 asm bugSergei Golubchik2013-05-071-6/+0
| | | | | | | | | | | | | | | | | | include/atomic/x86-gcc.h: force %esi register, don't give gcc a choice. (otherwise it could choose %ebx, and 4.1 did)
| * | mysql-5.5.31 mergeSergei Golubchik2013-05-078-9/+13
| |\ \ | | |/
| | * Updated/added copyright headersMurthy Narkedimilli2013-02-267-7/+7
| | |
| | * Bug#14300733 CMAKE DOES NOT CHECK FOR ZLIB VERSIONTor Didriksen2013-02-201-2/+6
| | | | | | | | | | | | | | | | | | Add check for compressBound() and deflateBound() Keep existing functionality: fallback to bundled zlib if functions not found.
| | * Placement change:Joerg Bruehe2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | Top level "SPECIFIC-ULN/" was inappropriate, put the files to create RPMs for ULN into "packaging/rpm-uln/".
* | | MDEV-4254 Semisync plugins to link statically into MariaDBSergei Golubchik2013-04-091-4/+4
| | | | | | | | | | | | fix semisync plugins and tests to work with both with static and dynamic linking
* | | 5.5 mergeSergei Golubchik2013-03-273-17/+28
|\ \ \ | |/ /
| * | hack in dependencies to imitate mysql-*.rpm even betterSergei Golubchik2013-03-061-1/+1
| | |
| * | MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-061-0/+1
| | | | | | | | | | | | | | | add --mysqld option to my_print_defaults change server-postin script to use that
| * | Fix wrong install location for DEB supportfiles.unknown2013-03-041-1/+1
| | |
| * | MDEV-4174 - Use kqueue for threadpool implementation on more BSD variants ↵Vladislav Vaintroub2013-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | than just FreeBSD or OSX - i.e NetBSD, OpenBSD, DragonFly, etc.
| * | make rpm packages to respect CMAKE_INSTALL_PREFIXSergei Golubchik2013-02-082-15/+24
| | |
* | | MDEV-4245 : Fix maintainer compilation flags.Vladislav Vaintroub2013-03-261-2/+2
| | | | | | | | | | | | | | | | | | -Wno-invalid-offsetoff is a C++ warnng, not C. Patch by Pavel Ivanov.
* | | move cassandra-related code from cmake/cpack_rpm.cmakeSergei Golubchik2013-01-291-3/+1
| | | | | | | | | | | | to storage/cassandra/CMakeLists.txt
* | | 5.5 mergeSergei Golubchik2013-01-298-17/+65
|\ \ \ | |/ /
| * | more changes for fedora18Sergei Golubchik2013-01-291-0/+1
| | |
| * | fix 'compat' rpm for fedora18Sergei Golubchik2013-01-291-0/+1
| | |
| * | MDEV-3971 : problems installing MariaDB packages (conflicts with ↵Vladislav Vaintroub2013-01-251-2/+2
| | | | | | | | | | | | | | | | | | mysql-libs-5.5) FIx : make "shared" RPM obsolete/provide mysql-libs
| * | MDEV-3832 MariaDB conflicts with packages filesystem-3.1-2.fc18.i686 and ↵Sergei Golubchik2013-01-191-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | jre-1.7.0_09-fcs.i586 on Fedora 18 fix the rpm packaging to work on Fedora18. Two problems: * conflicts on common directories with other packages. * more auto-generated requirements for mariadb-test.rpm
| * | Fix Windows installers' bootstrapper scripts , after ↵Vladislav Vaintroub2013-01-181-1/+1
| | | | | | | | | | | | mysql_performance_tables.sql was split off mysql_system_tables.sql
| * | mysql-5.5.29 mergeSergei Golubchik2013-01-157-9/+31
| |\ \
| | * | Placement change:Joerg Bruehe2012-11-081-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Top level "SPECIFIC-ULN/" was inappropriate, put the files to create RPMs for ULN into "packaging/rpm-uln/".
| | * Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGINTor Didriksen2012-10-242-1/+5
| | | | | | | | | | | | | | | | | | Part three: Fix some search paths.
| | * Use MESSAGE(STATUS ...) as we don't want any popup from the build system.Tor Didriksen2012-10-232-2/+2
| | |
| | * Fix formatting in 'INFO_BIN' on Windows - backport.Joerg Bruehe2012-10-191-3/+5
| | |
| | * Bug#13713525 CREATE_INITIAL_DB.CMAKE IS FAILING ON WINDOWS, STILL "DEVENV" ↵Tor Didriksen2012-10-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RETURNS 0 This bug depends on cmake version. For cmake 2.6 (which is still in use for some pushbuild trees) the main build would succeed, even if create_initial_db failed. The problem was the chaining of commands in the CUSTOM_COMMAND to produce 'initdb.dep'. It first invokes cmake to run mysqld, then invokes 'touch' to create the file. Moving the 'touch' command makes the error propagate properly for both cmake 2.6 and 2.8
| | * Merge changes for ULN RPMs into main 5.5Joerg Bruehe2012-09-211-1/+6
| | |\
View Lorry Controller Status