Commit graph

54 commits

Author SHA1 Message Date
Vasil Dimov
61eeca5a4c Merge mysql-trunk-bugfixing -> mysql-trunk-innodb 2010-07-29 12:42:55 +03:00
Vladislav Vaintroub
99a26e0f02 Cleanup after bild team push.
* 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)
2010-07-25 19:30:18 +02:00
Vasil Dimov
8152cd0ac8 Merge mysql-trunk-bugfixing -> mysql-trunk-innodb
(resolving conflicts in mysql-test/suite/rpl/t/rpl_sync-slave.opt and
configure.cmake)
2010-07-21 17:22:29 +03:00
Alexander Nozdrin
9503a8e23f Manual merge from mysql-trunk.
Conflicts:
  - scripts/CMakeLists.txt
2010-07-19 18:00:29 +04:00
Davi Arnaut
74283a052e Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-02 16:38:04 -03:00
Kent Boortz
24b3962d51 CMakeLists.txt
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"
2010-06-23 12:56:22 +02:00
Vladislav Vaintroub
23d05c1c6e Bug#53593: Add some instrumentation to improve Valgrind sensitivity.
Implement WITH_VALGRIND for the CMake build.
2010-06-21 13:39:30 +02:00
Daniel Fischer
915bfb505e Fixed a readability optimization in CMake code that broke IPv6 support. 2010-06-21 10:59:54 +02:00
Daniel Fischer
9891642e77 merge 2010-06-18 17:04:15 +02:00
Tor Didriksen
2857b55a46 Bug #53445 Build with -Wall and fix warnings that it generates
Post-push fix: -Wall implies -Wunused on some platforms,
which will generate thousands of warnings about unused parameters.
2010-05-27 09:42:48 +02:00
Tor Didriksen
d8536dfbdd Bug #53445 Build with -Wall and fix warnings that it generates
Add -Wall to gcc/g++
Fix most warnings reported in dbg and opt mode.
2010-05-26 16:12:23 +02:00
Kent Boortz
3dec34f4f7 configure.cmake
- Reverted a faulty change of MY_SEARCH_LIBS
 - Added the proper change for MY_SEARCH_LIBS and HAVE_<libname>
2010-05-25 10:14:07 +02:00
Alexander Nozdrin
75e552d509 Fix for Bug#52923 (Inadequate documentation of "Can't get hostname for your 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.
2010-05-21 17:17:01 +04:00
Kent Boortz
497abee8f3 config.h.cmake
- 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
2010-05-21 01:40:12 +02:00
Kent Boortz
bb6c611314 config.h.cmake
- 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"
2010-05-18 14:25:02 +02:00
Luis Soares
b684173e33 BUG#52341: PB2: rpl tests started taking three times more time on
linux x86_64 max 

Rpl tests were surprisingly taking too long when server was built
using cmake on linux. This was because cmake counter part of
patch for WL#4949 was not defining SIGNAL_WITH_VIO_CLOSE flag,
which had negative impact on the time needed to stop the slave IO
thread on STOP SLAVE command.

We fix this by deploy the missing SET command on configure.cmake.
2010-03-24 18:55:06 +00:00
Dmitry Lenev
dcaa144852 Fix for bug #51105 "MDL deadlock in rqg_mdl_stability test
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.
2010-02-28 07:35:09 +03:00
Vladislav Vaintroub
09dfcfa14b check for poll.h 2010-02-14 20:30:41 +01:00
Vladislav Vaintroub
513027f4fd Fix syntax errors in configure.cmake 2010-01-29 03:49:13 +01:00
vvaintroub
f719e51f8b Add windows system check cache that prevents tests from running, most are irrelevant anyway
Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or 
dynamic.
2010-01-29 03:07:00 +01:00
Vladislav Vaintroub
8d74e5c50e Added AIX, OS400 and Cygwin.
This finishes of moving code from configure.cmake IF()'s to platform specific files
2010-01-27 02:52:04 +01:00
Vladislav Vaintroub
a144dc31ac fix default architecture flag (v8) on sparc32 gcc that prevent mysql from compilng, add HPUX.cmake 2010-01-27 01:50:19 +01:00
Vladislav Vaintroub
1f07f5c18e Fixed typos and failed mysqld--help test. 2010-01-26 22:05:41 +01:00
Vladislav Vaintroub
0bdfa9d5eb Move FreeBSD specific hacks to cmake/os/FreeBSD.cmake 2010-01-26 18:13:37 +01:00
Vladislav Vaintroub
e5154ba9c0 Move OSX specific checks to cmake/os/Darwin.cmake 2010-01-26 18:09:14 +01:00
Vladislav Vaintroub
25d8787a32 WL#5161: Following Mats' suggestion, moved Solaris specific workaround to cmake/os/SunOS.cmake 2010-01-26 15:43:53 +00:00
Vladislav Vaintroub
3a7be724dc WL#5161, implement Mats' suggeston to move platform specifics into own files
under cmake/os. This patch does it for Linux
2010-01-26 15:56:50 +01:00
Vladislav Vaintroub
19a2c052a5 WL#5161: Implement Mats' suggestion of moving OS specific CMake code to OS specific files, instead of
polluting code with IF(CMAKE_SYSTEM_NAME MATCHES...), first on Windows.
2010-01-26 13:47:34 +01:00
Vladislav Vaintroub
6e0d562320 Fix failing yassl tests on OSX
WORDS_BIGENDIAN was wrongly defined to 1
2010-01-21 01:42:17 +01:00
Vladislav Vaintroub
726e9f5060 Fix AIX error during compile in my_handler (pointer to data is used, while pointer to function is expected).
This also has generated warnings on all other platforms
2010-01-19 18:22:51 +01:00
Vladislav Vaintroub
df4b65b533 Fix various compiler/OS compatibility errors 2010-01-19 16:31:21 +01:00
Vladislav Vaintroub
ce59ee8098 Fix some problems found by kent.
-lm is sometimes not linked, which causes errors about undefined rint()
- FreeBSD embedded library does not link with the flags returned by mysql_config
 (added -lcrypt to LIBS, whereby causing overlinking in case of normal non-embedded client)
2010-01-18 21:19:24 +01:00
Vladislav Vaintroub
4bf1d5b5dd Post-merge fixes , define HAVE_RWLOCK_T on Solaris define
DISABLE_MYSQL_THREAD_H for strings
Also, enable unittests for perfschema
2010-01-14 18:42:28 +00:00
Vladislav Vaintroub
ccf2600f66 Do not link with mtmalloc on Solaris.
add WITH_MYSQLD_LIBS for extra linker flags for mysqld
2010-01-13 21:56:51 +01:00
Vladislav Vaintroub
5cddb6c15f use _GNU_SOURCE on Linux to have all useful definitions (pthread_rwlock_t) for example 2010-01-13 16:52:14 +01:00
Vladislav Vaintroub
3fe740e13d Workaround a linker problem on OSX 10.4 2010-01-12 00:31:50 +01:00
Vladislav Vaintroub
7edec12185 Fix the last merge 2010-01-05 02:26:20 +01:00
Vladislav Vaintroub
5dbbb867e1 restore flaky loadxml test, fix solaris plugin load using -lpthread instead of -lthread 2009-12-23 04:44:25 +01:00
Vladislav Vaintroub
cd94452eda merge 2009-12-19 14:11:48 +01:00
Vladislav Vaintroub
9c9cc49060 merge 2009-12-19 03:21:49 +01:00
Vladislav Vaintroub
3a72f357ee Check for clock_gettime in librt 2009-12-10 04:09:32 +01:00
Vladislav Vaintroub
09c3bb13d4 Remove -Wl,--as-needed option, broken on Fedora 2009-12-09 16:34:52 +01:00
Vladislav Vaintroub
b5761e6348 couple of tweaks for solaris on sparc, link with librt, as it defines sched_yield 2009-12-08 03:12:23 +01:00
Vladislav Vaintroub
a9329d5d3f fix some Solaris Sparc errors from recent cleanup 2009-12-07 23:31:10 +01:00
Vladislav Vaintroub
9b31158e3c simplify some tests, silence warning in script install 2009-12-07 22:01:03 +01:00
Vladislav Vaintroub
dc798a489f Add libm to the lib of required libraries when doing system checks 2009-12-07 12:25:46 +01:00
Vladislav Vaintroub
db1b3d2d7d do not use -z defs on Solaris, it complains about libc.so implicit dependency 2009-12-07 01:50:54 +00:00
Vladislav Vaintroub
a1ebd4245e On Linux, support -Wl,--no-undefined (only client shared library)
and --Wl,--as-needed (all shared modules). The later will remove
unused dependencies (also from gcc and C++ runtime)
2009-12-07 02:16:05 +01:00
Vladislav Vaintroub
456395813a fdatasync is not documented on Snow Leopard and is not in unistd.h
CMake finds it as it is expored by system libraries, though attempts to
use it will result bring a warning. Fix by using CHECK_SYMBOL_EXISTS
instead of CHECK_FUNCTION_EXISTS
2009-12-05 16:15:17 +01:00
Vladislav Vaintroub
f458a4c963 merge 2009-11-30 01:49:26 +00:00