Commit graph

310 commits

Author SHA1 Message Date
Jonathan Perkin
cfb2379036 Fix typo in previous. 2010-07-05 17:19:59 +01:00
Jonathan Perkin
c14e08401a kent's recent changes to this file resulted in flag loss due to
the way cmake parses, in particular CMAKE_SIZEOF_VOID_P was
uninitialized during the first parse, and the bad values were
cached.

Pull in SIZEOF_VOIDP macro from package_name.cmake, define some
useful variables, and clean up the file a bit with explicit
definitions, to hopefully avoid this problem in the future.
2010-07-05 15:46:51 +01:00
Davi Arnaut
54a5c00de9 Unset the execute bit where it's not needed. 2010-07-03 20:17:03 -03:00
Davi Arnaut
5641fb64b4 Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-02 16:38:04 -03:00
Jonathan Perkin
d8621f8924 Fix icc/icpc flags. 2010-07-02 14:02:50 +01:00
Jonathan Perkin
38954b526b Don't cache {C,CXX} flags, this file is parsed twice, the first time
CMAKE_SIZEOF_VOID_P is unset so the variables are set incorrectly.
2010-07-02 13:28:17 +01:00
Jonathan Perkin
4c626c0588 Fix syntax error (missing quote). 2010-07-01 14:55:52 +01:00
Vladislav Vaintroub
1134fe2fdb Bug #52850: mysqld-debug.pdb doesn't match
mysqld-debug.exe in 5.5.3 on windows

Fix:

- Do not rename PDB, install mysqld.pdb matching 
mysqld-debug.exe into bin\debug subdirectory

- Stack tracing code will now additionally look in 
debug subdirectory of the application directory 
for debug symbols.

- Small cleanup in stacktracing code: link with 
dbghelp rather than load functions dynamically 
at runtime, since dbghelp.dll is always present.

- Install debug binaries with WiX

cmake/install_macros.cmake:
  Add optional COMPONENT and PDB_DESTINATION 
  to INSTALL_DEBUG_TARGET
mysys/stacktrace.c:
  If binary is build with DBUG, also look in debug subdirectory
  of  executable directory. Packaging will put some PDBs there
  (e.g bin\mysqld-debug.exe will have corresponding pdb in 
  bin\debug)
  
  Also some cleanup: do not load dbghelp dynamically, instead
  link with it. dbghelp is present on all Windows starting with 
  XP.
packaging/WiX/CPackWixConfig.cmake:
  Install debug binaries
sql/CMakeLists.txt:
  Do not rename PDB for mysqld-debug.exe, install it in debug subdirectory
2010-06-30 14:10:29 +02:00
Jonathan Perkin
0699a98413 Fix previous 2010-06-25 16:16:46 +01:00
Jonathan Perkin
5dd1d5c2b4 Update ICC flags to avoid deprecated options. 2010-06-25 15:01:18 +01:00
Jonathan Perkin
654637d463 Ensure aio is available on Linux. 2010-06-25 11:02:39 +01:00
Joerg Bruehe
1e37ae0ea2 Automerge the bug fix 54739 into the 5.5.5-m3 release clone. 2010-06-24 13:02:50 +02:00
Joerg Bruehe
a5d9e0e0c4 Merge bug fix. 2010-06-23 16:32:03 +02:00
Joerg Bruehe
33173fbe82 Fix Bug #54739
Accidental change in compile-time definitions for FreeBSD


Revert the accidental setting of "HAVE_BROKEN_REALPATH"
on current versions of FreeBSD,

do it for both autotools ("configure.in")
and cmake ("cmake/os/FreeBSD.cmake").
2010-06-23 16:19:19 +02:00
Jonathan Perkin
f84c866c5c Remove storage/ndb from dist sources. 2010-06-23 13:36:19 +01:00
Kent Boortz
fb583cfaea 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
sunanda
cf9d4c456d Made the changes as per Kent/wlad to include http://lists.mysql.com/commits/111802 2010-06-23 10:23:41 +02:00
Vladislav Vaintroub
21e943e0d1 Fix syntax error (missing space in SET command), that effectively prevents mysqld from being build with SSL. 2010-06-22 19:47:49 +02:00
Vladislav Vaintroub
3c74f80ab1 Fix ~1000 warnings class/struct mismatch.
Handle this warning in the future as error, this will prevent pushing to main trees.
2010-06-22 18:40:14 +02:00
Magne Mahre
7657ee10f8 Post-push fixups for WL#5349
mysql-test/suite/perfschema/t/no_threads-master.opt:
  Innodb will start multiple threads, which is
  not compatible with --one-thread.   Disable
  innodb to be able to run the test case.
2010-06-22 12:13:47 +02:00
Daniel Fischer
073943cd7d merge 2010-06-18 17:04:15 +02:00
Davi Arnaut
60153dd36e Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-06-08 20:44:25 -03:00
Joerg Bruehe
7758bdc8aa Get rid of the "net retry count" difference which
is not needed any more with current versions of FreeBSD.
(Entries 52410 and 52412 in the Bug DB)

That change is based on Dan Nelson replying on the
FreeBSD mailing list, freebsd-questions@freebsd.org
in a thread running from 2010-Apr-29 to 2010-May-1 titled
     "Need info about FreeBSD and interrupted system
      calls for MySQL code"

Also, ensure the cmake settings correspond to the autotools
ones: Add "HAVE_BROKEN_REALPATH" to cmake.


cmake/os/FreeBSD.cmake:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  However, it is still being kept as a comment for now,
  so that it can be re-activated should the need arise.
  
  In addition, set "HAVE_BROKEN_REALPATH" to completely
  mirror the autotools path.
configure.in:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  This definitely holds for FreeBSD version 6 and up.
  
  Adapt the informational messages to the path taken.
2010-05-27 19:02:19 +02:00
Daniel Fischer
458d0e7ae0 merge 2010-05-27 16:11:13 +02:00
Joerg Bruehe
9d83e2a79c Get rid ot the "net retry count" difference which
is not needed any more with current versions of FreeBSD.
(Entries 52410 and 52412 in the Bug DB)

That change is based on Dan Nelson replying on the
FreeBSD mailing list, freebsd-questions@freebsd.org
in a thread running from 2010-Apr-29 to 2010-May-1 titled
    "Need info about FreeBSD and interrupted system
     calls for MySQL code"

Also, ensure the cmake settings correspond to the autotools
ones: Add "HAVE_BROKEN_REALPATH" to cmake.

cmake/os/FreeBSD.cmake:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  However, it is still being kept for now, so that it can be
  re-activated should the need arise.
  
  In addition, set "HAVE_BROKEN_REALPATH" to completely
  mirrot the autotools path.
configure.in:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  However, it is still being kept for now, so that it can be
  re-activated should the need arise.
  
  Adapt the informational messages to the path taken.
2010-05-21 19:31:55 +02:00
Jon Olav Hauglid
198d51efe7 manual merge from mysql-trunk-bugfixing 2010-05-18 14:52:51 +02:00
Konstantin Osipov
d1dd2d11c4 Committing on behalf of Valdislav Vaintroub (reviewed and
approved):

3161 Vladislav Vaintroub       2010-04-29                 
 Bug#53196 : CMake builds don't support 'make tags' and 
'make ctags' targets.  
   - Added tags and ctags targets


CMakeLists.txt:
  Add tags and ctags targets.
cmake/Makefile.am:
  Add a cmake file to build tags.
cmake/tags.cmake:
  Build tags and ctags.
2010-05-14 18:42:10 +04:00
Jonathan Perkin
ce2aabb712 Changes to build using CMake according to existing release packages:
- Update/fix file layouts for each package type, add new types for
   native package formats including deb, rpm and svr4.

 - Build all plugins, including debug versions

 - Update compiler flags to match current release

 - Add missing @VAR@ expansions

 - Install correct mysqclient library symlinks

 - Fix icc/ia64 builds

 - Fix install of libmysqld-debug

 - Don't include mysql_embedded

 - Remove unpackaged manual pages to avoid missing files warnings

 - Don't install mtr's test suite
2010-05-12 12:51:23 +01:00
Jonathan Perkin
56a526c8a3 Explicitly set OSX flags, to match current release. 2010-05-07 12:11:09 +02:00
Jonathan Perkin
53acb1e58a Tidy install layout.
Remove 'ROOT' from sql-bench dir variable, it's unnecessary.
2010-05-06 15:20:14 +02:00
Jonathan Perkin
559c23fde2 Build all plugins.
Try to fix ia64/icc builds.
2010-05-05 13:49:03 +02:00
Daniel Fischer
fdf36464b3 apply wlad's patch to read the fill_help_tables.sql file whole, not line by line 2010-04-30 15:28:08 +02:00
Daniel Fischer
463a60ece6 merge 2010-04-30 13:36:57 +02:00
Jonathan Perkin
6f3e306683 Sync icc flags with reality. 2010-04-28 21:01:26 +02:00
Daniel Fischer
b83e1c8686 Merge 2010-04-21 14:58:09 +02:00
Mats Kindahl
c0817bacaf WL#5030: Splitting mysql_priv.h
Removing traces of mysql_priv.h from comments and other
non-source files that were missed before.
2010-04-21 00:29:30 +02:00
Jonathan Perkin
08b5cc6a4b Only use /usr/lib64 on x86_64, ia64 for example still uses /usr/lib 2010-04-19 20:21:04 +02:00
Jonathan Perkin
9b590649b8 Disable SSL with Intel CC 2010-04-16 15:05:58 +02:00
Jonathan Perkin
a03f41ee13 Fix SVR4 datadir 2010-04-01 14:56:25 +02:00
Jonathan Perkin
f3ebc19a33 Try to fix datadir 2010-04-01 13:35:16 +02:00
Jonathan Perkin
7ef2f9fa51 Apply wlad fixes from mysql-next-mr-bugfixing 2010-03-31 11:40:02 +02:00
Jonathan Perkin
089ff3dfa9 Back out remains of previous attempt. 2010-03-30 17:24:44 +02:00
Jonathan Perkin
bde4d7d3ee Fix from wlad. 2010-03-30 17:13:07 +02:00
Jonathan Perkin
08ec0a2a87 Try again.. 2010-03-30 13:37:17 +02:00
Jonathan Perkin
736f2eae74 Try to fix the debug permissions stuff. 2010-03-30 12:32:38 +02:00
Jonathan Perkin
285d7ad2f8 Install debug plugins, from wlad. 2010-03-26 17:28:06 +01:00
Jonathan Perkin
42f3842ef8 Expand INSTALL_INFODIR correctly.
Make mysql.info optional.
2010-03-25 15:04:39 +01:00
Jonathan Perkin
b462a3e0b3 Don't install documentation when INSTALL_LAYOUT=RPM, as the spec file
prefers to take docs directly from the source tree.
2010-03-25 13:16:13 +01:00
Jonathan Perkin
651aeb62ec Add INSTALL_INFODIR and use it to install mysql.info into the
correct location.
2010-03-25 11:43:11 +01:00
Jonathan Perkin
779b967d75 Avoid newline in date output. 2010-03-24 20:17:41 +01:00