Commit graph

60341 commits

Author SHA1 Message Date
vvaintroub
aa134fdf99 Move WITH_UNITTESTS option up - otherwise it skips plugin unittests 2010-01-28 14:33:44 +01:00
Vladislav Vaintroub
9632ea7475 do not redefine CPACK_PACKAGE_FILE_NAME, if it is already given 2010-01-28 11:30:21 +01:00
Vladislav Vaintroub
9cabc9fd8a prettification of package names and fix compile bug on OSX/ppc 2010-01-28 11:09:05 +01:00
Vladislav Vaintroub
eb81868421 Fix issues around MYSQL_TCP_PORT_DEFAULT (should be really 0 all the time) 2010-01-27 14:23:33 +01:00
Vladislav Vaintroub
24b6ae2d0b 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
90d4e963f1 merge 2010-01-27 01:54:41 +01:00
Vladislav Vaintroub
0a6fe4fb84 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
6625d6b905 Fix failing test cases on pushbuild 2010-01-26 23:47:57 +01:00
Vladislav Vaintroub
cdb8cafb27 Fixed typos and failed mysqld--help test. 2010-01-26 22:05:41 +01:00
Vladislav Vaintroub
bc80c38a54 Move FreeBSD specific hacks to cmake/os/FreeBSD.cmake 2010-01-26 18:13:37 +01:00
Vladislav Vaintroub
3241885f90 Move OSX specific checks to cmake/os/Darwin.cmake 2010-01-26 18:09:14 +01:00
Vladislav Vaintroub
62bc68a054 WL#5161: Following Mats' suggestion, moved Solaris specific workaround to cmake/os/SunOS.cmake
cmake/os/SunOS.cmake:
  WL#5161: Moved Solaris specific  workaround to cmake/os/SunOS.cmake
2010-01-26 15:43:53 +00:00
Vladislav Vaintroub
7ce02039af 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
a8c47397fc 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.

cmake/libutils.cmake:
  Fix the case in MERGE_LIBRARIES, where  there is no dependency on OS libraries.
cmake/os/Windows.cmake:
  Move windows specific code to cmake/os/Windows.cmake
configure.cmake:
  Move some Windows code to cmake/os/Windows.cmake
2010-01-26 13:47:34 +01:00
Vladislav Vaintroub
28a5ee8f05 add CMakeLists.txt to EXTRA_DIST for audit_null 2010-01-26 07:54:03 +01:00
Vladislav Vaintroub
9129685e51 merge, add plugin/audit_null/CMakeLists.txt 2010-01-26 05:39:48 +01:00
Alexander Nozdrin
f8a5a1284b Enable one test case for weekly builds. 2010-01-25 19:12:25 +03:00
Alexander Nozdrin
8baba07f6a Make sys_vars.delayed_insert_limit_func experimental due to Bug 50435. 2010-01-25 19:04:56 +03:00
Vladislav Vaintroub
809e20f2d7 Fix typos :
- opensolaris cmake package is SUNWcmake not SUNWCMake
- it is configure.cmake not config.cmake
2010-01-25 15:14:42 +01:00
Vladislav Vaintroub
32f0a54628 In standalone package, default data subdirectory is "data", not "var" 2010-01-25 13:12:29 +01:00
Vladislav Vaintroub
135c25d165 Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,
compile embedded with PIC to allow linking with shared libraries
2010-01-25 02:52:32 +01:00
Vladislav Vaintroub
4fe79c7d58 Following autotools tradition, add preprocessor definitions specified in environment variable CPPFLAGS 2010-01-24 21:03:21 +01:00
Vladislav Vaintroub
b4d6a13510 Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separators in get_relative_path() on Windows 2010-01-24 20:03:10 +01:00
Vladislav Vaintroub
c514d75ebb Handle different installation layouts.
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)
2010-01-24 16:23:16 +01:00
Vladislav Vaintroub
df9f68e973 Replace another abort() under DBUG_EXECUTE_IF with DBUG_ABORT to avoid popups on Windows. 2010-01-22 20:23:45 +01:00
Vladislav Vaintroub
cb5b0d4ffa merge 2010-01-22 12:50:33 +01:00
Sergey Vojtovich
1c4a72feea Merge backport of WL#3771 with mysql-next-mr. 2010-01-22 12:37:51 +04:00
Vladislav Vaintroub
68c66c645a cherrypick a followup fix from marc 2010-01-22 02:21:54 +01:00
Vladislav Vaintroub
4acc380f15 restore lost -g when WITH_DEBUG was specified 2010-01-21 12:37:22 +00:00
Vladislav Vaintroub
e4687956c1 Cherrypick fix for -DWITH_SSL=system by Marc Alff (Bug#50513) 2010-01-21 19:41:01 +01:00
Alexander Nozdrin
08bcd2d8f6 Auto-merge from mysql-next-mr. 2010-01-21 12:14:34 +03:00
Vladislav Vaintroub
32cbda18fb Fix failing yassl tests on OSX
WORDS_BIGENDIAN was wrongly defined to 1
2010-01-21 01:42:17 +01:00
Vladislav Vaintroub
6e84defdd4 Add -lmtmalloc to server linker flags on Solaris 10
and later
2010-01-20 17:21:38 +00:00
Luis Soares
8b7d5366ce Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDS
in errmsg.txt. Kept the one in that matched the location
in errmsg-utf8.txt, ie after ER_UNKNOWN_LOCALE.
2010-01-20 17:01:49 +00:00
Vladislav Vaintroub
411788d5de Correctly cast the result of malloc. 2010-01-20 16:39:28 +01:00
Alexander Nozdrin
725936c6ec Add client/dtoa.c to .bzrignore. 2010-01-20 18:26:05 +03:00
Alexander Nozdrin
da32064baf Mark several failing test cases experimental. 2010-01-20 18:25:29 +03:00
Vladislav Vaintroub
27c2433b9d Remove backslashes used as line continuation characters : makes scripts unusable under Windows. 2010-01-20 00:56:54 +01:00
Vladislav Vaintroub
bc61d6e840 Add Solaris sparc Sun Studio flags 2010-01-20 00:28:47 +01:00
Vladislav Vaintroub
e6e8855bf2 merge 2010-01-20 00:53:32 +01:00
Vladislav Vaintroub
a71e4cf18e - another take on BUILD_CONFIG variable - use OPTION instead of SET for
boolean variables to ensure option is in cache. Also use documented CMAKE_USE_MAKE_RULES_OVERRIDE feature instead of INCLUDE.

- remove superfluous tests in innobase's CMakeLists.txt
2010-01-20 00:52:21 +01:00
Kent Boortz
c196a00580 Merge 2010-01-19 22:32:36 +01:00
Vladislav Vaintroub
7753db1d17 Fix compatibility problem with older HPUX 2010-01-19 20:44:01 +01:00
Alexander Nozdrin
ce3dcc6c56 Auto-merge from mysql-next-mr-bugfixing. 2010-01-19 22:43:10 +03:00
Vladislav Vaintroub
3db12ce6b6 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
Sergey Vojtovich
d0ceec6021 Merge backport of WL#3771 with mysql-next-mr. 2010-01-19 20:42:25 +04:00
Kent Boortz
5656555965 Added collections for the "test-bt" test targets 2010-01-19 17:14:25 +01:00
Vladislav Vaintroub
0d8b633ad9 merge 2010-01-19 16:32:58 +01:00
Vladislav Vaintroub
8bffa163f8 Fix various compiler/OS compatibility errors 2010-01-19 16:31:21 +01:00
Sergey Vojtovich
667b5944a7 Merge backport of WL#3771 with mysql-next-mr. 2010-01-19 17:30:55 +04:00