summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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. CMakeLists.txt: Add the subdirectory holding specific stuff for the RedHat-compatible RPMs for ULN. cmake/install_layout.cmake: Explicitly mention my the ULN RPMs are handled.
* | 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". cmake/build_configurations/mysql_release.cmake: Enable basic optimization for debug builds.
* Updated/added copyright headersKent Boortz2011-07-041-16/+0
|\
* | Updated/added copyright headersKent Boortz2011-06-3035-32/+107
|/
* RETURN doesn't exactly return from the macro...Daniel Fischer2011-06-101-9/+8
|
* Bug#12641810 - MYSQL MAKE DIST DOESN'T WORK WHEN USING MYSQL TREE + PLUGIN ↵Tor Didriksen2011-06-102-0/+24
| | | | | | | | | TREE(S) cmake/make_dist.cmake.in: Run 'bzr export' for plugins. cmake/plugin.cmake: Lookup plugins with bzr repos.
* Followup to 12607800, testing it in PB2 didn't work, trying againBjorn Munch2011-06-011-1/+1
| | | | | Be more explicit about path to (potential) plugin tests dirs
* Bug #12607800 ADD HOOK TO INSTALL TESTS FROM IMPORTED FEATURE TREESBjorn Munch2011-06-011-1/+12
| | | | | Sets INSTALL_PLUGINTESTDIR if any plugin/*/tests exist
* Bug #12598603 HAVE COLLECTIONS FILES IN FEATURE TREES AUTO-APPENDED TO ↵Bjorn Munch2011-05-271-1/+22
| | | | | | | | COMMON FILES Do this in the common plugin.cmake but only if running in PB2 (If done in manual builds it would create a bzr diff)
* merge from 5.5-mtrBjorn Munch2011-05-261-0/+5
|\
| * Bug #12586211 ENABLE GCOV BUILDS WITH CMAKE, INCLUDING PLUGINSBjorn Munch2011-05-251-0/+5
| | | | | | | | | | Added --with-gcov option to configure.pl and use that from SETUP.sh
* | Don't check for FIONREAD on windows.Tor Didriksen2011-05-261-0/+1
|/ | | | | | | | | Execution of platforms tests are slow/flaky when building on windows. in PB:mysql-next-mr-opt-team on 2011-05-18 for win x86 debug_max, i see: -- Looking for FIONREAD -- Looking for FIONREAD - found and the build fails.
* Merge of fix for bug#11757855 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-301-0/+4
|
* Backport of (part of) bug #11760838 to 5.5.Georgi Kodinov2011-04-281-2/+10
| | | | | Enabled the ABI check to run on MacOSX.
* Fix for Bug#11892055 - "GCC COMPILER FLAG -WOVERLOADED-VIRTUAL NOT USED, ↵Guilhem Bichot2011-04-261-1/+1
| | | | WHICH LETS BUGS IN"
* Bug#11766320 MYSQL SYMBOLIC LINKS NOT WORKINGMagne Mahre2011-04-141-1/+2
| | | | | | | | | | | 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
|
* Merge from mysql-5.5.10-releaseunknown2011-03-161-1/+1
|\
| * The client shared library major version was changed to 18, to reflectKent Boortz2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ABI changes (Bug#60061) Bumping the version from 16 to 18, instead of 17, was done to avoid a library conflict on Mac OS X between MySQL 5.1 and MySQL 5.5. In MySQL 5.1 GNU libtool was used, that made the ABI version used in the file name to be 16, and the one stored inside the binary to be 17. MySQL 5.5 uses CMake as a build tool, that will store the same ABI number in the file name as inside the binary in Mac OS X, and then bumping the ABI number two steps avoids a conflict on Mac OS X.
* | Implementing Bug #57175 MySQL source tarballs should include generated spec fileMySQL Build Team2011-03-031-0/+6
| |
* | Merge bug fix 42969 into main 5.5 branch.Joerg Bruehe2011-02-144-1/+200
|\ \ | |/ |/|
| * Fix bug#42969 Please add a MANIFEST to each buildJoerg Bruehe2011-02-114-1/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, there will be new files "INFO_SRC" and "INFO_BIN", which describe the source and the binaries. They will be contained in all packages: - in "tar.gz" and derived packages, in "docs/", - in RPMs, in "/usr/share/doc/packages/MySQL-server". "INFO_SRC" is also part of a source tarball. It gives the version as exact as possible, preferably by calling "bzr version-info" on the source tree. If that is not possible, it just contains the three level version number. "INFO_BIN" contains some info when and where the binaries were built, the options given to the compiler, and the flags controlling the included features. The tests (test "mysql" in the main suite) are extended to verify the existence of both "INFO_SRC" and "INFO_BIN", as well as some of the expected contents. CMakeLists.txt: For the new files describing the source and the build ("INFO_SRC" and "INFO_BIN"), we need a new file "cmake/info_macros.cmake.in" with the build rules. 1) This file must be configured with the current variables. 2) "INFO_SRC" can be created during the cmake phase, but this should be repeated with each "make" to protect against a developer doing only "make" after a "bzr pull" (or "bzr commit"). So have it both as a cmake rule and as a custom target. 3) "INFO_BIN" must be created during the make phase only, because it contains information from files which will be written at the end of the cmake phase only. Therefore, it must be a custom target which is included in all "make" targets. 4) The resulting "INFO_*" files must be included in packages. cmake/info_bin.cmake: This is the file to create "INFO_BIN", by calling the "CREATE_INFO_BIN()" macro. It must be a separate file, so that the macro definitions can be included in other cmake scripts without that file inclusion causing a side effect, the macro call. That call would modify the source tree which should be trated read-only. cmake/info_macros.cmake.in: This new file contains the macros to create the "INFO_*" files during various steps of the build, the calls will be at other places. 1) For source: If running from a BZR tree, always create (update) "INFO_SRC" by running "bzr version-info". Outside a BZR tree, try to take it from exported sources, and create it only if missing, in that case put the three level version number into it. 2) "INFO_BIN" contains - date/time and host name of the build host, - information about the platform, - information about the C and CXX compiler and the options given to them (Unix only), - the feature flags as reported by "cmake -L". cmake/info_src.cmake: This is the file to create "INFO_SRC", by calling the "CREATE_INFO_SRC()" macro. It must be a separate file, so that the macro definitions can be included in other cmake scripts without that file inclusion causing a side effect, the macro call. That call would modify the source tree which should be trated read-only. cmake/make_dist.cmake.in: Create a "VERSION_src" file during "make dist". In case it already exists from a preceding "cmake" run or tree export (which is quite likely), a new "make dist" must not modify it. mysql-test/r/file_contents.result: Result of test for bug#42969. mysql-test/t/file_contents.test: Perl test scriptlet for bug#42969. support-files/mysql.spec.sh: Add "INFO_SRC" and "INFO_BIN" to the RPM contents.
| * Manual merge from mysql-5.5.Alexander Nozdrin2010-12-161-2/+2
| |\
* | | Bug #58991 DEFAULT_CHARSET and DEFAULT_COLLATION does not work with CMake.Tor Didriksen2011-01-041-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | cmake/character_sets.cmake: Fix typo in variable name. Some cosmetics. config.h.cmake: Do not use hard-coded defaults for charset and collation.
* | | Bug #58699 cannot build with gcc dbg on solarisTor Didriksen2010-12-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | merge mysql-5.5->mysql-5.5-bugteamGeorgi Kodinov2010-12-161-2/+2
|\ \ \ | |/ / |/| / | |/
| * Fix the .deb package prefix.Jonathan Perkin2010-11-251-2/+2
| |
* | bug#58955: Must -DBUILD_CONFIG=mysql_release require libaio on LinuxJonathan Perkin2010-12-161-11/+15
| | | | | | | | | | | | Allow users to build without aio if they really want to, by passing -DIGNORE_AIO_CHECK to cmake.
* | Bug#58871: Reorganize maintainer mode compiler flags to allowDavi Arnaut2010-12-151-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | option for specific compilers Reorganize the maintainer mode cmake code to allow options for specific compilers. For now, enable -Wcheck for ICC, but do not turn warnings into errors. CMakeLists.txt: Move the code that sets options to cmake/maintainer.cmake cmake/maintainer.cmake: Add macros for each specific compiler.
* | bug#58766: Server binary was compiled without fast-mutexesJonathan Perkin2010-12-071-1/+4
| | | | | | | | | | Re-enable fast mutexes on Linux for release builds.
* | Post-fix for Bug#58158 on SolarisVladislav Vaintroub2010-11-251-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Problem : The build might fail with make[2]: *** No rule to make target `../sql/z', needed by `sql/mysqld_dtrace_all.o'. Stop. if one of plugins would depends on system libz library Fix: Filter out non-static dependent libraries when dtracing static libs
* | Bug #58372 cmake should not write temporary files in the source directoryTor Didriksen2010-11-231-13/+17
| | | | | | | | | | | | cmake/do_abi_check.cmake: Put temporary files in ${BINARY_DIR} rather than in source directory. Slight reformatting for readability of commands.
View Lorry Controller Status