Vladislav Vaintroub
ebf2e76289
merge, add plugin/audit_null/CMakeLists.txt
2010-01-26 05:39:48 +01:00
Alexander Nozdrin
9ba4d00763
Enable one test case for weekly builds.
2010-01-25 19:12:25 +03:00
Alexander Nozdrin
deb6ded14c
Make sys_vars.delayed_insert_limit_func experimental due to Bug 50435.
2010-01-25 19:04:56 +03:00
Vladislav Vaintroub
1c0f30ae9a
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
261a29e20e
In standalone package, default data subdirectory is "data", not "var"
2010-01-25 13:12:29 +01:00
Vladislav Vaintroub
1519d8ccd1
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
03fcdd0194
Following autotools tradition, add preprocessor definitions specified in environment variable CPPFLAGS
2010-01-24 21:03:21 +01:00
Vladislav Vaintroub
8ec9fdd4ab
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
c827968a2d
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
80f57fb252
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
ebc6b1d370
merge
2010-01-22 12:50:33 +01:00
Sergey Vojtovich
9da56d3b09
Merge backport of WL#3771 with mysql-next-mr.
2010-01-22 12:37:51 +04:00
Vladislav Vaintroub
f895fb6060
cherrypick a followup fix from marc
2010-01-22 02:21:54 +01:00
Vladislav Vaintroub
50d844d24a
restore lost -g when WITH_DEBUG was specified
2010-01-21 12:37:22 +00:00
Vladislav Vaintroub
f945be03d3
Cherrypick fix for -DWITH_SSL=system by Marc Alff (Bug#50513)
2010-01-21 19:41:01 +01:00
Alexander Nozdrin
b78e3a5d1e
Auto-merge from mysql-next-mr.
2010-01-21 12:14:34 +03: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
4060fe7d43
Add -lmtmalloc to server linker flags on Solaris 10
...
and later
2010-01-20 17:21:38 +00:00
Luis Soares
47ac596080
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
4a9c5f7988
Correctly cast the result of malloc.
2010-01-20 16:39:28 +01:00
Alexander Nozdrin
97edd3aa3a
Add client/dtoa.c to .bzrignore.
2010-01-20 18:26:05 +03:00
Alexander Nozdrin
b561f9262e
Mark several failing test cases experimental.
2010-01-20 18:25:29 +03:00
Vladislav Vaintroub
7dc406fb13
Remove backslashes used as line continuation characters : makes scripts unusable under Windows.
2010-01-20 00:56:54 +01:00
Vladislav Vaintroub
a28aa354fa
Add Solaris sparc Sun Studio flags
2010-01-20 00:28:47 +01:00
Vladislav Vaintroub
576d64dc8b
merge
2010-01-20 00:53:32 +01:00
Vladislav Vaintroub
df2d0359d8
- 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
6ddb3d5dc6
Merge
2010-01-19 22:32:36 +01:00
Vladislav Vaintroub
83bb5da586
Fix compatibility problem with older HPUX
2010-01-19 20:44:01 +01:00
Alexander Nozdrin
91e92d73ab
Auto-merge from mysql-next-mr-bugfixing.
2010-01-19 22:43:10 +03: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
Sergey Vojtovich
ec59b40adc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 20:42:25 +04:00
Kent Boortz
d8d4369a7e
Added collections for the "test-bt" test targets
2010-01-19 17:14:25 +01:00
Vladislav Vaintroub
173b74eca8
merge
2010-01-19 16:32:58 +01:00
Vladislav Vaintroub
df4b65b533
Fix various compiler/OS compatibility errors
2010-01-19 16:31:21 +01:00
Sergey Vojtovich
92985af1ff
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
Vladislav Vaintroub
7d1d78e574
Fix end-of-line characters in mysql_release.cmake to be unix-conform
...
make -DBUILD_CONFIG=mysql_release work
2010-01-19 02:21:48 +00:00
Vladislav Vaintroub
0139d40d26
Add compiler flags used by the buildteam to do release
2010-01-19 01:47:51 +01:00
Vladislav Vaintroub
801af5f2fe
Do not run GCC atomic builtins tests on MSVC
2010-01-18 23:43:03 +01:00
Vladislav Vaintroub
b3d8871c8d
In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windows
2010-01-18 23:42:22 +01:00
Vladislav Vaintroub
5ca186b519
Add targets test-bt-fast and test-bt-debug
...
They are probably sometimes used by the bteam
2010-01-18 23:41:20 +01:00
Vladislav Vaintroub
b030db38af
merge
2010-01-18 23:00:48 +01:00
Vladislav Vaintroub
cf4732275e
just in case old linux is used, add _GNU_SOURCE preprocessor constant to be able to see pthread_rwlock_t
2010-01-18 21:38:30 +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
Alexander Nozdrin
d01746b58e
Auto-merge from mysql-next-mr.
2010-01-18 22:47:19 +03:00
Alexander Nozdrin
53f72bf3df
Auto-merge from mysql-next-mr.
2010-01-18 21:50:57 +03:00
Alexander Nozdrin
dccf2accea
Enable sys_vars and perfschema test suites
...
for regular PB builds.
2010-01-18 15:01:11 +03:00
Alexander Nozdrin
69bb73aa38
Auto-merge from mysql-5.1-rpl-merge.
2010-01-18 14:53:35 +03:00
Vladislav Vaintroub
0ebe60070b
Bug#50362:
...
Init MY_PTHREAD_MUTEX_FAST prior to first usage to avoid crash on
FreeBSD
2010-01-16 05:04:02 +01:00
Vladislav Vaintroub
8d665d799c
2010-01-16 04:56:35 +01:00
Vladislav Vaintroub
266c812282
Fix output name of embedded library,
...
honor OUTPUT_NAME in MERGE_LIBRARIES macro
2010-01-15 19:07:45 +01:00