summaryrefslogtreecommitdiff
path: root/config.h.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+0
|\
| * remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-1/+0
| |
* | fix innodb plugin versionsSergei Golubchik2012-10-271-0/+2
|/
* MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-0/+7
| | | | | add missing checks to configure.cmake remove dead code and unused HAVE_xxx constants from the sources
* MDEV-418 Feedback plugin statisics problemSergei Golubchik2012-07-311-0/+1
| | | | Add the check for sys/utsname.h to configure.cmake
* MDEV-329: MariaDB 5.5 does not use fdatasync().unknown2012-06-081-0/+1
| | | | | | The --debug-no-sync incorrectly defaulted to ON, disabling sync calls by default which can loose data or cause corruption. Also, the code used fsync() instead of the sometimes more efficient fdatasync().
* MDEV-220 MariaDB server 5.5 GA candidate has default storage engine MyISAMSergei Golubchik2012-04-191-0/+2
|
* disable safemalloc for valgrind builds.Sergei Golubchik2012-02-231-1/+5
| | | | | | always try to use valgrind headers in debug builds. define HAVE_valgrind for --with-valgrind fix valgrind check in my_valgrind.h
* another backtrace resolver that prints source file name and line numberSergei Golubchik2011-12-111-0/+1
|
* compilation failure on SolarisSergei Golubchik2011-11-281-0/+1
|
* compilation fixesSergei Golubchik2011-11-271-3/+1
| | | | | | | | | | | cmake/maintainer.cmake: don't do -Werror just yet config.h.cmake: according to MSDN PSAPI_VERSION should be 1 in a portable application mysys/my_thr_init.c: first, reset THR_KEY_mysys, and then free dbug data, because dbug data are automacially created on the next dbug call, unless THR_KEY_mysys is null.
* mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+0
|\
| * Bug#12779790 COMPILATION FAILS OS X 10.7 - IMPLICIT DECLARATION OFJon Olav Hauglid2011-07-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FUNCTION 'PTHREAD_INIT' The problem was that compilation would fail with a warning: Implicit declaration of function 'pthread_init' if MySQL was compiled on OS X 10.7 (Lion). The reason was that pthread_init() is now part of an internal OS X pthread library so it was found by CMake. This patch fixes the problem by removing HAVE_PTHREAD_INIT and related code. pthread_init() was specific to MIT-pthreads which has not been supported since 4.1 and was therefore no longer relevant. No test case added.
* | 5.5-mergeSergei Golubchik2011-07-021-11/+20
|\ \ | |/
| * Merge of fix for bug#11757855 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-301-0/+4
| |
| * FIONREAD is located in sys/filio.h on Solaris.Davi Arnaut2011-04-291-0/+1
| |
| * Bug#11766320 MYSQL SYMBOLIC LINKS NOT WORKINGMagne Mahre2011-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | When MySQL converted from autotools to CMake, the preprocessor symbol USE_SYMDIR was omitted by mistake. Without this symbol, the code for checking .sym files is not built. This patch defines USE_SYMDIR when built on MS Windows.
| * Remove some leftovers from the removal of the gethostbyname wrappers.Davi Arnaut2011-04-131-3/+0
| |
| * mergeGeorgi Kodinov2011-02-021-0/+5
| |
| * Bug #58991 DEFAULT_CHARSET and DEFAULT_COLLATION does not work with CMake.Tor Didriksen2011-01-041-5/+4
| | | | | | | | | | | | | | | | cmake/character_sets.cmake: Fix typo in variable name. Some cosmetics. config.h.cmake: Do not use hard-coded defaults for charset and collation.
| * Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-5/+3
| | | | | | | | | | | | | | | | | | | | | | and 'THREAD_SAFE_CLIENT'. As of MySQL 5.5, we no longer support non-threaded builds. This patch removes all references to the obsolete THREAD and THREAD_SAFE_CLIENT preprocessor symbols. These were used to distinguish between threaded and non-threaded builds.
| * Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-12-271-1/+1
| |\
| | * Bug #58699 cannot build with gcc dbg on solarisTor Didriksen2010-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake/os/SunOS.cmake: Remove TARGET_OS_SOLARIS config.h.cmake: Remove TARGET_OS_SOLARIS Add PTHREAD_ONCE_INITIALIZER configure.cmake: Add function for testing whether we need { PTHREAD_ONCE_INIT } rather than PTHREAD_ONCE_INIT include/my_pthread.h: Use PTHREAD_ONCE_INITIALIZER if set by cmake. include/mysql/psi/mysql_file.h: Include my_global.h first, to get correct platform definitions. mysys/ptr_cmp.c: Hide the unused static functions in #ifdef's on solaris. Use __sun (defined by both gcc and SunPro cc) rather than TARGET_OS_SOLARIS sql/my_decimal.cc: Include my_global.h first, to get correct platform definitions. sql/mysqld.cc: Fix signed/unsigned comparison warning. sql/sql_audit.h: Include my_global.h first, to get correct platform definitions. sql/sql_plugin.h: Include my_global.h first, to get correct platform definitions. sql/sql_show.cc: Fix: warning: cast from pointer to integer of different size sql/sys_vars.h: Use reinterpret_cast rather than c-style cast. storage/perfschema/pfs_instr.cc: Include my_global.h first, to get correct platform definitions.
| * | Define MYSQL_(MAJOR|MINOR)_VERSION the way things are defined in CMakeVasil Dimov2010-12-021-0/+3
| |/ | | | | | | | | | | | | instead of hacking a custom ADD_DEFINITIONS(). Approved by: Kent Boortz (via IRC)
| * mergeGeorgi Kodinov2010-10-041-1/+0
| |\
| | * A better fix for bug #56405 "Deadlock in the MDL deadlockDmitry Lenev2010-09-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detector" that doesn't introduce bug #56715 "Concurrent transactions + FLUSH result in sporadical unwarranted deadlock errors". Deadlock could have occurred when workload containing a mix of DML, DDL and FLUSH TABLES statements affecting the same set of tables was executed in a heavily concurrent environment. This deadlock occurred when several connections tried to perform deadlock detection in the metadata locking subsystem. The first connection started traversing wait-for graph, encountered a sub-graph representing a wait for flush, acquired LOCK_open and dived into sub-graph inspection. Then it encountered sub-graph corresponding to wait for metadata lock and blocked while trying to acquire a rd-lock on MDL_lock::m_rwlock, since some,other thread had a wr-lock on it. When this wr-lock was released it could have happened (if there was another pending wr-lock against this rwlock) that the rd-lock from the first connection was left unsatisfied but at the same time the new rd-lock request from the second connection sneaked in and was satisfied (for this to be possible the second rd-request should come exactly after the wr-lock is released but before pending the wr-lock manages to grab rwlock, which is possible both on Linux and in our own rwlock implementation). If this second connection continued traversing the wait-for graph and encountered a sub-graph representing a wait for flush it tried to acquire LOCK_open and thus the deadlock was created. The previous patch tried to workaround this problem by not allowing the deadlock detector to lock LOCK_open mutex if some other thread doing deadlock detection already owns it and current search depth is greater than 0. Instead deadlock was reported. As a result it has introduced bug #56715. This patch solves this problem in a different way. It introduces a new rw_pr_lock_t implementation to be used by MDL subsystem instead of one based on Linux rwlocks or our own rwlock implementation. This new implementation never allows situation in which an rwlock is rd-locked and there is a blocked pending rd-lock. Thus the situation which has caused this bug becomes impossible with this implementation. Due to fact that this implementation is optimized for wr-lock/unlock scenario which is most common in the MDL subsystem it doesn't introduce noticeable performance regressions in sysbench tests. Moreover it significantly improves situation for POINT_SELECT test when many connections are used. No test case is provided as this bug is very hard to repeat in MTR environment but is repeatable with the help of RQG tests. This patch also doesn't include a test for bug #56715 "Concurrent transactions + FLUSH result in sporadical unwarranted deadlock errors" as it takes too much time to be run as part of normal test-suite runs. config.h.cmake: We no longer need to check for presence of pthread_rwlockattr_setkind_np as we no longer use Linux-specific implementation of rw_pr_lock_t which uses this function. configure.cmake: We no longer need to check for presence of pthread_rwlockattr_setkind_np as we no longer use Linux-specific implementation of rw_pr_lock_t which uses this function. configure.in: We no longer need to check for presence of pthread_rwlockattr_setkind_np as we no longer use Linux-specific implementation of rw_pr_lock_t which uses this function. include/my_pthread.h: Introduced new implementation of rw_pr_lock_t. Since it never allows situation in which rwlock is rd-locked and there is a blocked pending rd-lock it is not affected by bug #56405 "Deadlock in the MDL deadlock detector". This implementation is also optimized for wr-lock/unlock scenario which is most common in MDL subsystem. So it doesn't introduce noticiable performance regressions in sysbench tests (compared to old Linux-specific implementation). Moreover it significantly improves situation for POINT_SELECT test when many connections are used. As part of this change removed try-lock part of API for this type of lock. It is not used in our code and it would be hard to implement correctly within constraints of new implementation. Finally, removed support of preferring readers from my_rw_lock_t implementation as the only user of this feature was old rw_pr_lock_t implementation. include/mysql/psi/mysql_thread.h: Removed try-lock part of prlock API. It is not used in our code and it would be hard to implement correctly within constraints of new prlock implementation. mysys/thr_rwlock.c: Introduced new implementation of rw_pr_lock_t. Since it never allows situation in which rwlock is rd-locked and there is a blocked pending rd-lock it is not affected by bug #56405 "Deadlock in the MDL deadlock detector". This implementation is also optimized for wr-lock/unlock scenario which is most common in MDL subsystem. So it doesn't introduce noticiable performance regressions in sysbench tests (compared to old Linux-specific implementation). Moreover it significantly improves situation for POINT_SELECT test when many connections are used. Also removed support of preferring readers from my_rw_lock_t implementation as the only user of this feature was old rw_pr_lock_t implementation.
| * | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-0/+2
| |/ | | | | | | | | Merged the implementation to a new base tree.
* | lots of post-merge changesSergei Golubchik2011-04-251-0/+2
|/
* Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-07-291-32/+5
|\
| * Cleanup after bild team push.Vladislav Vaintroub2010-07-251-32/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed obvious errors (HAVE_BROKEN_PREAD is not true for on any of systems we use, definitely not on HPUX) * Remove other junk flags for OSX and HPUX * Avoid checking type sizes in universal builds on OSX, again (CMake2.8.0 fails is different architectures return different results) * Do not compile template instantiation stuff unless EXPLICIT_TEMPLATE_INSTANTIATION is used. * Some cleanup (make gen_lex_hash simpler, avoid dependencies) * Exclude some unused files from compilation (strtol.c etc)
* | Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-07-211-98/+80
|\ \ | |/ | | | | | | | | (resolving conflicts in mysql-test/suite/rpl/t/rpl_sync-slave.opt and configure.cmake)
| * Manual merge from mysql-trunk.Alexander Nozdrin2010-07-191-0/+39
| |\ | | | | | | | | | | | | Conflicts: - scripts/CMakeLists.txt
| | * CMakeLists.txtKent Boortz2010-06-231-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake/build_configurations/mysql_release.cmake - Corrected spelling ENABLE_LOCAL_INFILE => ENABLED_LOCAL_INFILE - In addition to "RelWithDebInfo", set target "Release" and "Debug" - Set Debug flags - Enabled SSL on Mac OS X - For gcc builds, set RELEASE and DEBUG flags as well - For g++ builds, added "-fno-implicit-templates" - Use "-O" (gcc -O1) for optimized binaries, as "DEBUG" in out case is more about enabling trace support to the server, no optimization makes binaries too slow to be practical to reproduce problems cmake/os/WindowsCache.cmake - Removed unused HAVE_SYS_IOCTL config.h.cmake - Added header checks and missing defines - Removed unused HAVE_SYS_IOCTL - Grouped and uncommented some HAVE_* that are really not defines, but internal variables used in the CMake setup, - Added hard coded flags for HP-UX and Mac OS X configure.cmake - Added header checks and missing defines - Removed unused HAVE_SYS_IOCTL - "sys/dir.h" test needs "sys/types.h" - Corrected syntax for "sys/ptem.h" test - Don't exclude test for some types if Mac OS X, harmless to do the test and we want the HAVE_<type> settings - Added hard coded flags for HP-UX and Mac OS X extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt - Added missing source file "template_instnt.cpp"
| * | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-1/+0
| |/
| * mergeDaniel Fischer2010-06-181-97/+41
| |\
| | * configure.cmakeKent Boortz2010-05-251-1/+1
| | | | | | | | | | | | | | | | | | - Reverted a faulty change of MY_SEARCH_LIBS - Added the proper change for MY_SEARCH_LIBS and HAVE_<libname>
| | * config.h.cmakeKent Boortz2010-05-211-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set SIZEOF_VOIDP the same way as others - Unindent the no Mac OS settings, to let the checker scripts find the lines - Removed duplicate SIZEOF_SIZE_T setting - Added missing value for HAVE_CHARSET_ascii configure.cmake - Added HAVE_ prefix to library names, like HAVE_LIBM - Set HAVE_CXXABI_H if header is found, HAVE_ABI_CXA_DEMANGLE controls if useful - Set SIZEOF_VOIDP the same way as others
| | * config.h.cmakeKent Boortz2010-05-181-91/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing HAVE_SYS_TIMES_H, HAVE_SYS_TIME_H, HAVE_TIME_H, HAVE_TIME and HAVE_TIMES - Removed most #if constructs, keep logic in "configure.cmake" - Use space after # if inside #if, for consistency configure.cmake - Added MY_CHECK_TYPE_SIZE function that sets both SIZEOF_* and HAVE_* - If "sys/stream.h" exists, include it before "sys/ptem.h" in test - Set VOID_SIGHANDLER if RETSIGTYPE is set to "void"
| | * Build all plugins.Jonathan Perkin2010-05-051-0/+1
| | | | | | | | | | | | | | | Try to fix ia64/icc builds.
* | | Bug#53593: Add some instrumentation to improve Valgrind sensitivity.Vladislav Vaintroub2010-06-211-1/+1
|/ / | | | | | | Implement WITH_VALGRIND for the CMake build.
* | Fix for Bug#52923 (Inadequate documentation of "Can't get hostname for your ↵Alexander Nozdrin2010-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | address" error). The thing is that on some platforms (e.g. Mac OS X) sockaddr_in / sockaddr_in6 contain a non-standard field (sin_len / sin6_len), that must be set. The problem was that only standard fields were set, thus getnameinfo() returned EAI_SYSTEM instead of EAI_NONAME. The fix is to introduce configure-time checks (for GNU auto-tools and CMake) for those additional fields and to set them if they are available.
* | Changes to build using CMake according to existing release packages:Jonathan Perkin2010-05-121-0/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | - Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite
* Fix for bug #51105 "MDL deadlock in rqg_mdl_stability testDmitry Lenev2010-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Windows". On platforms where read-write lock implementation does not prefer readers by default (Windows, Solaris) server might have deadlocked while detecting MDL deadlock. MDL deadlock detector relies on the fact that read-write locks which are used in its implementation prefer readers (see new comment for MDL_lock::m_rwlock for details). So far MDL code assumed that default implementation of read/write locks for the system has this property. Indeed, this turned out ot be wrong, for example, for Windows or Solaris. Thus MDL deadlock detector might have deadlocked on these systems. This fix simply adds portable implementation of read/write lock which prefer readers and changes MDL code to use this new type of synchronization primitive. No test case is added as existing rqg_mdl_stability test can serve as one. config.h.cmake: Check for presence of pthread_rwlockattr_setkind_np to be able to determine if system natively supports read-write locks for which we can specify if readers or writers should be preferred. configure.cmake: Check for presence of pthread_rwlockattr_setkind_np to be able to determine if system natively supports read-write locks for which we can specify if readers or writers should be preferred. configure.in: Check for presence of pthread_rwlockattr_setkind_np to be able to determine if system natively supports read-write locks for which we can specify if readers or writers should be preferred. include/my_pthread.h: Added support for portable read-write locks which prefer readers. To do so extended existing my_rw_lock_t implementation to support selection of whom to prefer depending on a flag. mysys/thr_rwlock.c: Extended existing my_rw_lock_t implementation to support selection of whom to prefer depending on a flag. Added rw_pr_init() function implementing initialization of read-write locks preferring readers. sql/mdl.cc: Use portable read-write locks which prefer readers instead of relying on that system implementation of read-write locks has this property (this was true for Linux/NPTL but was false, for example, for Windows and Solaris). Added comment explaining why preferring readers is important for MDL deadlock detector (thanks to Serg for example!). sql/mdl.h: Use portable read-write locks which prefer readers instead of relying on that system implementation of read-write locks has this property (this was true for Linux/NPTL but was false, for example, for Windows and Solaris).
* SET FN_NO_CASE_SENSE to 1 on WindowsVladislav Vaintroub2010-02-201-0/+3
|
* check for poll.hVladislav Vaintroub2010-02-141-0/+1
|
* Add windows system check cache that prevents tests from running, most are ↵vvaintroub2010-01-291-0/+1
| | | | | | | irrelevant anyway Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or dynamic.
* Handle different installation layouts.Vladislav Vaintroub2010-01-241-0/+2
| | | | | | | | | | | | | | | | | using cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in tar.gz or zip packages. INSTALL_LAYOUT=UNIX will produce unixish install layout (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages. Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set. There are numerous other variables that allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc). This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX. There are 2 special options that expect full directory paths - MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent is --localstatedir) - SYSCONFDIR can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
* Fix failing yassl tests on OSX Vladislav Vaintroub2010-01-211-1/+7
| | | | WORDS_BIGENDIAN was wrongly defined to 1
* Fix various compiler/OS compatibility errorsVladislav Vaintroub2010-01-191-1/+1
|
* mergeVladislav Vaintroub2010-01-131-0/+1
|\