Commit graph

50 commits

Author SHA1 Message Date
iggy@alf.(none)
c0e9fe8d3f Merge alf.(none):/src/bug31319/my50-bug31319
into  alf.(none):/src/bug31319/my51-bug31319
2007-11-02 15:17:37 -04:00
iggy@alf.(none)
f9518db25f Bug#31319 CMake build does not check for minimum required version
- Add check
2007-11-02 15:16:45 -04:00
iggy@alf.(none)
806be9bb55 Merge alf.(none):/src/bug31289/my50-bug31289
into  alf.(none):/src/bug31289/my51-bug31289
2007-10-08 13:01:06 -04:00
iggy@alf.(none)
bcbb31d44d Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
tool error
- Move disable manifest generation commands to more global location.
2007-10-08 13:00:01 -04:00
kent@mysql.com/kent-amd64.(none)
413d1e1aa4 CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
  - Changed to do embedded build part as normal build, when
    WITH_EMBEDDED_SERVER is set.
  - Allow both normal and debug build with embedded.
  - Build static embedded library by pointing out all source and compile
    it all, i.e. not building libraries from libraries, not portable.
  - Let embedded use generated files from the "sql" directory, added
    dependencies to make sure built before embedded.
  - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
    linked in when debug target is used.
  - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
    others can't depend on it, not defined at configure time. Instead
    set the output file name.
  - Created work around for bug in CMake 2.4.6 and output names, to
    set the "mysqld<suffix>.pdb" name to the same base name.
  - Set the correct manifest "name" (patch by iggy)
2007-08-06 23:16:01 +02:00
iggy@amd64.(none)
b880985ea7 Post Merge Fixup. 2007-08-04 02:51:58 -04:00
kent@kent-amd64.(none)
405522690d Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-04 00:29:47 +02:00
kent@mysql.com/kent-amd64.(none)
abf4895367 CMakeLists.txt:
Removed space between '-D' and symbol
2007-08-04 00:26:46 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-03 22:57:21 +02: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
joerg@trift2.
3ba813fe4e Limit stack size of the server to 1 MB.
Manual transfer of the fix for bug#20815 from 5.0 to 5.1
2007-08-02 21:59:26 +02:00
joerg@trift2.
22d445ee70 Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.
They had been introduced in 5.1 and were only later backported to 5.0;
as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones,
and changes in 5.0 do not propagate into the 5.1 files.

To fix this, the (previous) files in 5.1 now are deleted ("bk rm"),
and the previously deleted files depending on 5.0 are now moved to the 
respective source directories ("bk mv").
The current 5.1 contents is restored in these files.

If you need the previous history of the 5.1 files ("bk revtool"),
access those in "BitKeeper/deleted".

Contrary to the original plan, I did not introduce the name
"CMakeLists.historic" - mostly in order not to clutter the source tree.

This fixes bug#29982.
2007-07-31 19:35:13 +02:00
iggy@amd64.(none)
2b8c90fed5 Bug#24732 Executables do not include Vista manifests
- Required manual merge.
2007-07-25 13:33:39 -04:00
iggy@amd64.(none)
1adbecd9a6 Bug#24732 Executables do not include Vista manifests
- Sign executables with MySQL AB security certificate.
2007-07-25 13:18:12 -04:00
df@pippilotta.erinye.com
cccecb833b BUG#20815 Errno 12 on Windows after 197 connections 2007-07-19 23:06:34 +02:00
iggy@amd64.(none)
7dddab867d Bug#24732 Executables do not include Vista manifests
- Post Merge Fixup
2007-06-26 14:24:01 -04:00
iggy@amd64.(none)
b1827ecb04 Bug#24732 Executables do not include Vista manifests
- Corrected manifest attributes.
2007-06-26 11:26:01 -04:00
iggy@alf.
c15a2647a0 Embedded Server doesn't build on Windows.
- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
2007-06-15 14:32:16 -04:00
iggy@amd64.(none)
586c5b430e Post Merge fixup. 2007-06-01 20:37:45 -04:00
iggy@amd64.(none)
5fc6a73b56 Bug #24732 Executables do not include Vista manifests
- Cleanup typo.
- Make sure to only embedded four part numberic version.
2007-06-01 16:48:23 -04:00
df@pippilotta.erinye.com
a2029a31a5 BUG#24732 manifest file was not included in VS2005 amd64 builds (5.1 tree version) 2007-05-04 09:42:46 +02:00
df@pippilotta.erinye.com
65e89f491a BUG#24732 manifest file was not included in VS2005 amd64 builds 2007-05-04 09:37:50 +02:00
df@pippilotta.erinye.com
39e98943f9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-02 19:21:50 +02:00
df@pippilotta.erinye.com
765b6f5572 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-02 19:19:46 +02:00
df@pippilotta.erinye.com
971992ea9a generate map files on windows 2007-05-02 15:50:08 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
e2f6bd86b4 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-29 18:42:50 +05:00
iggy@recycle.(none)
13b54aa963 Bug#24732 Executables do not include Vista manifests
- Post merge cleanup.
2007-04-23 16:23:32 -04:00
iggy@recycle.(none)
7a358c4b5c Bug#24732 Executables do not include Vista manifests
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
2007-04-23 15:41:24 -04:00
gkodinov/kgeorge@magare.gmz
975815280a Bug #27811:
FORCE_INIT_OF_VARS was not defined for the 
 debug builds on Windows. This caused LINT_INIT
 macro to be defined as NOP and this triggers
 false alarms about use of uninitialized with
 the runtime libs of some Visual Studio versions.
 Fixed by defining FORCE_INIT_OF_VARS to match the
 state of the Windows
2007-04-23 17:15:51 +03:00
msvensson@pilot.blaudden
46793b6134 Build zlib before extra since extra/comp_err uses zlib 2007-04-19 17:01:19 +02:00
msvensson@pilot.blaudden
00d80b5474 Add scripts/ subdiretory 2007-04-18 18:35:13 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +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
df@pippilotta.erinye.com
5197d7712c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-10 13:15:07 +02:00
df@pippilotta.erinye.com
817670eeee build fixes for 5.1.17 2007-04-04 14:19:47 +02:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7 configure.in:
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches
2007-03-28 23:00:50 +02:00
kent@mysql.com/kent-amd64.(none)
056356db05 Makefile.am:
Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
2007-03-22 16:53:37 +01:00
Antony@floppy.
adfdcb191c Fixes for 5.1-arch repository to compile on Windows. 2007-03-22 00:43:14 -07:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-10-21 01:13:50 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
08d47a3b81 make_win_bin_dist:
Copy udf examples and raid.h
  Create target "include" directory before copying files to it
CMakeLists.txt:
  Only compile in bdb if configured
configure.in:
  Raised version number to 5.0.27
2006-10-21 00:57:08 +02:00
iggy@rolltop.ignatz42.dyndns.org
e89c10e99c Bug#22224: Windows build depends on ib_config.h
This change has already been made to 5.1.
2006-09-28 15:18:33 -04:00
georg@lmy002.wdf.sap.corp
df606b28b1 In current 5.1 build we don't build embedded server for windows (this will be
fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us 
to upgrade from cmake 2.2 to 2.4.
2006-09-18 17:28:17 +02:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
brian@zim.(none)
7216b5bc7a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7 fix for windows build 2006-08-24 22:10:55 -07:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
brian@zim.(none)
b93a5c5f04 Updated row result, and fix for Windows build. 2006-08-14 03:26:53 -07:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline.
2006-05-11 11:29:08 -05:00
Renamed from cmakelists.txt (Browse further)