summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-164-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | in cmake tests let's treat clang like gcc (same options, same builtins) in many cases. * don't check the compiler when * testing for -fvisibility=hidden support * testing for HAVE_ABI_CXA_DEMANGLE * testing for HAVE_GCC_ATOMIC_BUILTINS * when removing options with string(replace) * when running ${CC} --version (ignore the error instead) * run ABI checks for clang * use "canonical" gcc flags for clang * fix groonga too Also: * add cmake detection for gcc __atomic_* builtins. they might be supported (__ATOMIC_SEQ_CST is defined), but not for all operand sizes. In particular, 64-bit atomic load is problematic on i386 * cache check results for Windows * remove the test for HAVE_CXXABI_H (HAVE_ABI_CXA_DEMANGLE is suffifient)
* MDEV-7771 missing client plugins when mariadb-shared is not installedSergei Golubchik2015-06-151-1/+2
| | | | | | | | Put client plugins into -common rpm, not -shared. Because they're needed for * all clients that link with shared libmysqlclient (-shared) * our clients from -client rpm, they're statically linked (-client) * the server that acts as a replication slave (-server)
* Merge branch '5.5' into 10.0Sergei Golubchik2015-06-112-6/+6
|\
| * Merge tag 'mysql-5.5.44' into bb-5.5-sergSergei Golubchik2015-06-051-5/+5
| |\
| | * Bug#20872436 MAKE DIST BY MISTAKE COPIES FILES WITH VARIABLE EXPANSIONTor Didriksen2015-04-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo: s/COPY_ONLY/COPYONLY/g (cherry picked from commit 034046b4dfe3e6f83e0cf73310884334e0507f06) Conflicts: cmake/make_dist.cmake.in
| * | MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-031-1/+1
| | | | | | | | | | | | don't include #include directives into .pp files
| * | CRLF->LFSergei Golubchik2015-06-022-94/+94
| | |
* | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-4/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-04-271-4/+4
| |\ \ | | |/
| | * Bug#20344207: Add support for CMake 3.1Jon Olav Hauglid2015-01-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Rename a CMake variable in compile_flags.cmake to avoid triggering CMake 3.1 warning about CMP0054 about interpreting if() arguments as keywords or variables. No changes in behavior.
* | | Merge remote-tracking branch 'origin/10.0' into 10.0Sergei Golubchik2015-02-221-21/+21
|\ \ \
| * | | Crash during configure without development SSL libraries installedVicențiu Ciorbaru2015-02-121-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorrect usage of OPENSSL_INCLUDE_DIR variable within cmake caused the configure step to fail. The variable was used before being checked if the include directory actually existed.
* | | | disable -Werror in MYSQL_MAINTAINER_MODE=ON until all plugins are readySergei Golubchik2015-02-201-1/+1
| | | | | | | | | | | | | | | | only activate it on MYSQL_MAINTAINER_MODE=ERRON
* | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-185-59/+49
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-115-42/+44
| |\ \ | | |/
| | * Bug#20136840 REMOVE REMAINING REFERENCES TO BZR IN CMAKE SCRIPTSTor Didriksen2014-12-114-49/+15
| | | | | | | | | | | | Patch for 5.5
| | * Bug#20043556 ALWAYS USE SAME FORMAT FOR INFO_SRC FILETor Didriksen2014-11-171-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the format of 'git log' to produce INFO_SRC: commit: <commit hash> date: 2014-11-12 11:11:10 +0100 build-date: 2014-11-17 15:24:16 +0100 short: <abbreviated commit hash> branch: mysql-5.5
| | * Bug#19908468 PLACE CORRECT INFORMATION IN INFO_SRC AFTER TRANSITIONING TO GITTor Didriksen2014-11-111-2/+20
| | | | | | | | | | | | Use 'git log -1; git branch' rather than 'bzr version-info'
| | * Bug#19890133 MAKE DIST USING BZR EXPORT EVEN FOR SOURCE DIR NOT A BZR REPOTor Didriksen2014-11-112-22/+61
| | | | | | | | | | | | | | | For 'make dist': only use 'bzr export' if bzr root == ${CMAKE_SOURCE_DIR} Same thing for git.
| | * Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-134-64/+87
| | | | | | | | | | | | | | | | | | | | | Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
| | * Bug #18808072 MYSQLBINLOG USES LOCALTIME() TO PRINT EVENTS, CAUSES KERNEL ↵Venkatesh Duggirala2014-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MUTEX CONTENTION Problem: For every event read, mysqlbinlog calls localtime() which in turn calls stat(/etc/localtime) which is causing kernel mutex contention. Analysis and Fix: localtime() calls stat(/etc/localtime) for every instance of the call where as localtime_r() the reentrant version was optimized to store the read only tz internal structure. Hence it will not call stat(/etc/localtime). It will call only once at the beginning. The mysql server is calling localtime_r() and mysqlbinlog tool is one place where we are still using localtime(). Once the process (mysqlbinlog) is started if timezone is changed it will be not picked up the the process and it will continue with the same values as the beginning of the process. This behavior is in-lined with mysql server. Also adding localtime_r() and gmtime_r() support for windows.
| | * Bug #19149091 5.5 BUILD BREAKS ON LINUX IF SUN DTRACE IS INSTALLEDBjorn Munch2014-07-091-1/+9
| | | | | | | | | | | | | | | | | | | | | Add some code adapted from 5.6 to check for "real" DTrace. If found, and system is Linux, we simply set DTRACE to OFF. Otherwise no change. Build will still break if one tries to manually set DTRACE to ON.
| | * Backport from trunk:Tor Didriksen2014-05-072-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12 We want to upgrade to VS2013 on Windows. In order to do this, we need to upgrade to cmake 2.8.12 This has introduced some incompatibilities for .pdb files, and "make install" no longer works. To reproduce: cmake --build . --target package --config debug The fix: Rather than installing .pdb files for static libraries, we use the /Z7 flag to store symbolic debugging information in the .obj files.
| | * Backport from trunk:Tor Didriksen2014-05-051-20/+23
| | | | | | | | | | | | Bug #18593044 COMPILE FLAGS NOT PASSED TO DTRACE, BREAKS CROSS BUILD
| | * Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARISTor Didriksen2014-02-251-1/+2
| | | | | | | | | | | | | | | | | | 'mysql_config --libs' outputs -L/path/to/library on SunOS we also want it to output '-R/path/to/library' in order to find libraries at runtime.
| | * Backport of Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18Tor Didriksen2014-01-232-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported only the softlink part of the patch, *not* the bumping of library version. With this patch, the libmysql/ directory contains: libmysqlclient.a libmysqlclient_r.a -> libmysqlclient.a libmysqlclient_r.so -> libmysqlclient.so* libmysqlclient_r.so.18 -> libmysqlclient.so.18* libmysqlclient_r.so.18.0.0 -> libmysqlclient.so.18.0.0* libmysqlclient.so -> libmysqlclient.so.18* libmysqlclient.so.18 -> libmysqlclient.so.18.0.0* libmysqlclient.so.18.0.0*
| | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-2/+1
| | |
| | * Bug#17632386: WITH_ASAN CONFLICTS WITH -WL,--NO-UNDEFINEDJon Olav Hauglid2013-10-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | -Wl,--no-undefined (=-z defs) gives linking errors when used with WITH_ASAN. According to the documentation: "When linking shared libraries, the AddressSanitizer run-time is not linked, so -Wl,-z,defs may cause link errors (don’t use it with AddressSanitizer)." This patch turns off -Wl,--no-undefined if WITH_ASAN is used.
| | * 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
| | * 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"
| | * 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/".
| | * 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
| | |\
| | | * More changes to supporting the build of RPMs for ULNJoerg Bruehe2012-06-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the MySQL 5.5 source tree. Contrary to the comment, the spec file for these ULN RPMs was missing in the previous changeset (blame ".bzrignore"). This change now brings said spec file, and it adds cmake handling for the new files. Still for internal tool tests only, not yet ready for publishing.
| | * | Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILDTor Didriksen2012-09-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore --with-client-ldflags it's not supported by the cmake scripts anyways. Ignore --with-mysqld-ldflags it's only used with --with-mysqld-ldflags=-static and that doesn't work.
| | * | Bug#13904906: YASSL PRE-AUTH CRASH WITH 5.1.62, 5.5.22Harin Vadodaria2012-07-241-1/+1
| | |/ | | | | | | | | | | | | | | | Problem: Valgrind reports errors when an invalid certificate is used on the client. Solution: Updated yaSSL to version 2.2.2.
| | * Merged some fixes from 7.2 release branchesBjorn Munch2012-03-223-5/+24
| | |
| | * Updated/added copyright headersMySQL Build Team2012-02-162-2/+2
| | |
| | * Bug#13463417 63487: ANNOYING TRACE MESSAGE IN CMAKE CODETor Didriksen2011-12-151-1/+0
| | | | | | | | | | | | Remove it.
| | * merge from 5.5.16Daniel Fischer2011-09-211-0/+4
| | |\
| | | * Source plugin library files list from cmake-generated file in RPM buildsDaniel Fischer2011-08-151-0/+4
| | | |
| | * | Update email address for Release Engineering.Jonathan Perkin2011-09-201-2/+2
| | |/
| | * Bug#12710832 - PB2 DAILY-TRUNK BUILD FAILS ON SOLARIS X86_64Tor Didriksen2011-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Compiler bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6879978 Workaround is to always specify "-xOn".
| | * Updated/added copyright headersKent Boortz2011-07-041-16/+0
| | |\
| | * | Updated/added copyright headersKent Boortz2011-06-3035-32/+107
| | |/
View Lorry Controller Status