Commit graph

31 commits

Author SHA1 Message Date
Daniel Fischer
b1109f0331 merge 2010-04-30 13:36:57 +02:00
Kent Boortz
b9303c87e3 On Mac OS X, add the "-arch" option to the 'mysql_config' output 2010-04-27 22:21:48 +02:00
Daniel Fischer
50edf454b1 Merge 2010-04-21 14:58:09 +02:00
Jonathan Perkin
bbe86d08ba Expand @HOSTNAME@. 2010-04-01 20:47:19 +02:00
Jonathan Perkin
f0856cc114 Try a bunch of fixes. 2010-03-31 23:52:49 +02:00
Joerg Bruehe
82b4452bd5 Some fixes for the build on Windows
as found necessary during the release build of 5.5.3-m3.
2010-03-22 16:02:31 +01:00
Vladislav Vaintroub
273d74eaa5 Bug #51488 :missing features and change behavior in cmake runs compared to
autotools runs
- Fix recognition of --with-debug=full in configure wrapper
- Remove CMakeCache.txt in configure wrapper, to match the original
- Fix recognition of max-no-ndb
- Fix broken dependencies of mysql_fix_privilege_table.sql from 
  mysql_system_tables.sql and mysql_system_tables_fix.sql
- Add "distclean target" that informs user about appropriate bzr command
2010-03-03 12:29:34 +01:00
Vladislav Vaintroub
00ce21159c Bug#51502: building with cmake creates an invalid mysqld_safe.
The problem was incorrect escaping used inside a strnig : in \"$MYSQLD\" was written as "\MYSQL\" 
(backslash and quote characters transposed), when defining FIND_PROC  variable for BSD or SysV
style "ps" command-

Additionally fixed obvious code duplication and random naming in CHECK_PID test.
2010-02-25 21:40:15 +01:00
Vladislav Vaintroub
ac3a0f0df6 merge, CMake bugfixes, remove sp-error from experimental 2010-02-23 13:50:45 +01:00
Vladislav Vaintroub
0563ac784e Fix some glitches with INSTALL_LAYOUT=STANDALONE
- mysql_install_db is in scripts dir now
- sql-bench is installed
-some extra support-files (e.g ini) are in support-files
2010-02-19 18:30:08 +01:00
Vladislav Vaintroub
7e01172ce3 Fix a couple fo things replated to MSI 2010-02-16 16:06:57 +01:00
Vladislav Vaintroub
890c52d889 Add components to INSTALL, some eraly Wix support 2010-02-10 20:23:24 +01:00
Vladislav Vaintroub
065dfb3f5d - Optionally, copy mysqld renamed to mysqld-debug from debug build directory into resulting package
- Fix  to mysql_install_db.pl to the correct place on Windows ( under scripts directory)
2010-02-04 02:17:18 +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
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
Vladislav Vaintroub
4e04b86355 port some mysql_binary_distribution hacks to cmake 2010-01-15 01:21:43 +01:00
Vladislav Vaintroub
f0a32f4027 fix syntax error in INSTALL cmake command 2010-01-14 15:02:27 +01:00
Vladislav Vaintroub
742ef94290 Remove support for "make install" DESTDIR - did not work as expected 2010-01-14 14:54:32 +01:00
Vladislav Vaintroub
dba1a7ccd9 Delay configuring scripts like mysql_install_db until CPack runs
(to handle DESTDIR correctly)
2009-11-26 18:40:45 +01:00
Vladislav Vaintroub
fbd542013f Fixes for cmake2.8 2009-11-16 14:45:06 +01:00
Vladislav Vaintroub
9edb94c69e fix make install/ mysqld_safe 2009-11-14 14:29:14 +01:00
Vladislav Vaintroub
13cd7170cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
Vladislav Vaintroub
46d04ebdef Backport of the patch
http://lists.mysql.com/commits/57725

Vladislav Vaintroub	2008-11-03
Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from 
TARGET_LINK_LIBRARIES. 
      
Every exe or dll linked with mysys needs ws2_32, because
mysys uses winsock function WSAStartup in my_init().
However, there is no need to explicitely add ws2_32 to
the list of TARGET_LINK_LIBRARIES multiple times. 
Visual Studio comes with a handy pragma that tells linker
to add library. So patch replaces bunch of ws2_32 in 
CMakeLists with  single pragma comment(lib,"ws2_32")
in my_init.c
      
Additionally, reference to non-existing "debug" library
has been removed from TARGET_LINK_LIBRARIES. The correct
name of the library is "dbug".
2009-09-30 03:39:37 +02:00
kent@mysql.com/kent-amd64.(none)
ae9a5a2fea Makefile.am, CMakeLists.txt, make_win_bin_dist:
Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
2008-01-31 20:55:58 +01:00
kent@mysql.com/kent-amd64.(none)
e45e7d9e2e Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:
Added Perl version of script "mysql_secure_installation"
make_win_bin_dist:
  Corrected copy of SQL files to "share" directory
2007-12-28 22:58:54 +01:00
kent@mysql.com/kent-amd64.(none)
18418ff8c5 make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
2007-12-28 01:02:28 +01:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d CMakeLists.txt, README, configure.js
Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
2007-08-03 21:51:37 +02:00
iggy@recycle.(none)
f4f9480785 Minor fix. 2007-05-02 12:41:36 -04:00
msvensson@pilot.blaudden
1561c39c5d Add "name of struct" as first arg to comp_sql
Fix "make distcheck"
2007-04-23 14:01:48 +02:00
msvensson@pilot.blaudden
41c41448b9 mysql_upgrade win fixes 2007-04-19 17:00:29 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405
2007-04-18 13:21:39 +02:00