Commit graph

201 commits

Author SHA1 Message Date
Jonathan Perkin
5830623b30 Update ICC flags to avoid deprecated options. 2010-06-25 15:01:18 +01:00
Jonathan Perkin
0c73d0c990 Ensure aio is available on Linux. 2010-06-25 11:02:39 +01:00
Joerg Bruehe
6eaa73ab77 Automerge the bug fix 54739 into the 5.5.5-m3 release clone. 2010-06-24 13:02:50 +02:00
Joerg Bruehe
7f0b7faa68 Merge bug fix. 2010-06-23 16:32:03 +02:00
Joerg Bruehe
f1cc08433e 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
fd4797e0d5 Remove storage/ndb from dist sources. 2010-06-23 13:36:19 +01:00
Kent Boortz
24b3962d51 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
ef745c9112 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
a4baec5c13 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
1ef39ee2d1 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
b4f77c40ec Post-push fixups for WL#5349 2010-06-22 12:13:47 +02:00
Daniel Fischer
9891642e77 merge 2010-06-18 17:04:15 +02:00
Davi Arnaut
43316c794a Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-06-08 20:44:25 -03:00
Joerg Bruehe
87dfc8ef1d 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.
2010-05-27 19:02:19 +02:00
Daniel Fischer
5f5d488978 merge 2010-05-27 16:11:13 +02:00
Joerg Bruehe
447846cf3c 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.
2010-05-21 19:31:55 +02:00
Jon Olav Hauglid
1c02ed3e67 manual merge from mysql-trunk-bugfixing 2010-05-18 14:52:51 +02:00
Konstantin Osipov
d63caa0c30 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
2010-05-14 18:42:10 +04:00
Jonathan Perkin
5b85121ca6 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
5230aa7a5e Explicitly set OSX flags, to match current release. 2010-05-07 12:11:09 +02:00
Jonathan Perkin
e31887f2ed Tidy install layout.
Remove 'ROOT' from sql-bench dir variable, it's unnecessary.
2010-05-06 15:20:14 +02:00
Jonathan Perkin
2c9803580f Build all plugins.
Try to fix ia64/icc builds.
2010-05-05 13:49:03 +02:00
Daniel Fischer
9e7536638a 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
b1109f0331 merge 2010-04-30 13:36:57 +02:00
Jonathan Perkin
ce57e2415c Sync icc flags with reality. 2010-04-28 21:01:26 +02:00
Daniel Fischer
50edf454b1 Merge 2010-04-21 14:58:09 +02:00
Mats Kindahl
f96694f9c7 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
1c6e257797 Only use /usr/lib64 on x86_64, ia64 for example still uses /usr/lib 2010-04-19 20:21:04 +02:00
Jonathan Perkin
89e111f966 Disable SSL with Intel CC 2010-04-16 15:05:58 +02:00
Jonathan Perkin
5593e29304 Fix SVR4 datadir 2010-04-01 14:56:25 +02:00
Jonathan Perkin
f037ad4fbf Try to fix datadir 2010-04-01 13:35:16 +02:00
Jonathan Perkin
80fd4bef18 Apply wlad fixes from mysql-next-mr-bugfixing 2010-03-31 11:40:02 +02:00
Jonathan Perkin
e28ea740ad Back out remains of previous attempt. 2010-03-30 17:24:44 +02:00
Jonathan Perkin
98e33d14fa Fix from wlad. 2010-03-30 17:13:07 +02:00
Jonathan Perkin
2e160175c4 Try again.. 2010-03-30 13:37:17 +02:00
Jonathan Perkin
6740352b92 Try to fix the debug permissions stuff. 2010-03-30 12:32:38 +02:00
Jonathan Perkin
71785753b6 Install debug plugins, from wlad. 2010-03-26 17:28:06 +01:00
Jonathan Perkin
48f61d94f7 Expand INSTALL_INFODIR correctly.
Make mysql.info optional.
2010-03-25 15:04:39 +01:00
Jonathan Perkin
127bdb6eda 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
5fd878c3f0 Add INSTALL_INFODIR and use it to install mysql.info into the
correct location.
2010-03-25 11:43:11 +01:00
Jonathan Perkin
d5d30d435a Avoid newline in date output. 2010-03-24 20:17:41 +01:00
Jonathan Perkin
03bb7032e2 Try to add support for MYSQL_U_SCORE_VERSION and MYSQL_COPYRIGHT_YEAR. 2010-03-24 17:52:47 +01:00
Jonathan Perkin
aa917229b9 Fix mysql-test directory in RPMs.
While here:

 - split INSTALL_*DIR variables into two sections, first set the major
   variables, then second set the minor ones, using the major where
   appropriate.

 - format the settings for easier parsing (at least with a wide terminal)
2010-03-23 16:53:11 +01:00
Jonathan Perkin
b960456150 First cut at -DINSTALL_LAYOUT=DEB support. 2010-03-23 15:33:35 +01:00
Jonathan Perkin
146a47ee12 Install libs directly into %{_libdir} 2010-03-23 13:56:28 +01:00
Jonathan Perkin
2dcbad90ba Try some more RPM fixes. 2010-03-23 12:28:13 +01:00
Jonathan Perkin
3fbdf9b838 Fix RPM prefix. 2010-03-22 23:23:18 +01:00
Jonathan Perkin
bb0d537524 Set CPACK_PACKAGE_CONTACT, required for .deb 2010-03-22 23:15:28 +01:00
Jonathan Perkin
c41240939b Attempt to fix RPM support-files directory. 2010-03-22 18:33:20 +01:00
Jonathan Perkin
31cc7f2eb0 Tidy. 2010-03-22 16:00:37 +01:00