summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Updated/added copyright headersKent Boortz2011-07-031-1/+2
|\
| * fixing 38697/11749301MySQL Build Team2011-03-211-0/+1
| |
* | Updated/added copyright headersKent Boortz2011-06-301-1/+1
|\ \ | |/ |/|
| * Updated/added copyright headersKent Boortz2011-06-301-1/+2
| |
| * Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.eKent Boortz2009-12-111-0/+1
| | | | | | | | | | | | | | Windows 2000. Visual Studio 2003 and 2005 require _WIN32_WINNT >= 0x0500 (Win2000) for TryEnterCriticalSection.
* | Bug #50021: Windows standard configuration files are showing Linux Georgi Kodinov2010-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | options/settings 1. Changed the default value for socket on Windows to the windows default 2. Removed hard-coded trailing slashes from innodb_data_home_dir and innodb_log_group_name_dir. 3. Added extra backslashes to the innodb directory example 4. Made the tempdir platform "dependent" 5. Fixed the comments in the .ini files 6. Removed the tmpdir from the templates and the scripts
* | Bug #47795 CMake, storage engine name different from directory nameMagnus Blåudd2009-10-081-2/+7
| | | | | | | | | | | | - Read plug.in to fid the name of the engine to link with, does not have to be same as engine dir - Use engine dir when figuring out which libraries to build limbysqld with
* | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from 6.0 to 5.1. Only those sync points are included, which are used in debug_sync.test. The Debug Sync Facility allows to place synchronization points in the code: open_tables(...) DEBUG_SYNC(thd, "after_open_tables"); lock_tables(...) When activated, a sync point can - Send a signal and/or - Wait for a signal Nomenclature: - signal: A value of a global variable that persists until overwritten by a new signal. The global variable can also be seen as a "signal post" or "flag mast". Then the signal is what is attached to the "signal post" or "flag mast". - send a signal: Assign the value (the signal) to the global variable ("set a flag") and broadcast a global condition to wake those waiting for a signal. - wait for a signal: Loop over waiting for the global condition until the global value matches the wait-for signal. Please find more information in the top comment in debug_sync.cc or in the worklog entry.
* | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-141-0/+1
| |
* | merge fix to define __NT__ on WindowsVladislav Vaintroub2009-08-111-3/+3
|\ \
| * | Always compile with __NT__ on windows. in 5.1 itthis #define isVladislav Vaintroub2009-08-111-3/+3
| | | | | | | | | | | | widely used, in replication (delete_allow_opened) and for named pipe support. We do not support Win9x anymore.
* | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-71/+89
|\ \ \ | |/ /
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-72/+90
| | | | | | | | | | | | | | | Remove custom DLL loader code from innodb plugin code, use symbols exported from mysqld.
* | | Auto-mergeIgnacio Galarza2009-07-311-0/+10
|\ \ \ | | |/ | |/|
| * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | - Define and pass compile time path variables as pre-processor definitions to mimic the makefile build. - Set new CMake version and policy requirements explicitly. - Changed DATADIR to MYSQL_DATADIR to avoid conflicting definition in Platform SDK header ObjIdl.h which also defines DATADIR.
* | | automergeGeorgi Kodinov2009-07-161-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Bug #45287: phase 1 : 32 bit compilation warningsGeorgi Kodinov2009-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixed the following problems: 1. cmake 2.6 warning because of a changed default on how the dependencies to libraries with a specified path are resolved. Fixed by requiring cmake 2.6. 2. Removed an obsolete pre-NT4 hack including defining Windows system defines to alter the behavior of windows.h. 3. Disabled warning C4065 on compiling sql_yacc.cc because of a know incompatibility in some of the newer bison binaries.
* | merged 5.0-bugteamGeorgi Kodinov2009-05-271-0/+4
|\ \ | |/
| * Updates to build with community features enabled for community builds.MySQL Build Team2009-05-201-0/+4
| |
* | merge fix for 43082 from 5.0-bugteamVladislav Vaintroub2009-02-251-1/+7
|\ \ | |/
| * Bug#43082: mysqld 32 bit cannot use big buffers due to 2GBVladislav Vaintroub2009-02-251-1/+7
| | | | | | | | | | | | usermode address space limit. Fix: use /LARGEADDRESSAWARE link option when linking 32 bit executables
* | merge: 5.1 -> 5.1-rplLuis Soares2009-01-231-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test
| * | Bug#38784: Mysql server crash if table is altered with partition changes.Mattias Jonsson2008-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | | Occurred with EXTRA_DEBUG on windows. Problem was insufficient length of a local variable that stored path names. Solution was to use the correct length.
* | | Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-061-8/+6
|\ \ \ | |/ /
| * | mergeVladislav Vaintroub2008-09-011-8/+6
| |\ \ | | |/
| | * Work around for older version of cmake.iggy@amd64.(none)2008-04-071-4/+4
| | |
| | * Changes for Visual Studio 9iggy@slim.2008-04-071-8/+6
| | |
| | * Merge mysql.com:/misc/mysql/mysql-5.0tnurnberg@white.intern.koehntopp.de2008-03-271-0/+4
| | |\ | | | | | | | | | | | | into mysql.com:/misc/mysql/mysql-5.0-opt
* | | \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplmsvensson@pilot.mysql.com2008-04-031-0/+12
|\ \ \ \ | |/ / / | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
| * | | Merge mysql.com:/misc/mysql/mysql-5.1tnurnberg@white.intern.koehntopp.de2008-03-271-0/+4
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/misc/mysql/mysql-5.1-opt
| | * \ \ Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optgkodinov/kgeorge@magare.gmz2008-03-211-0/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
| | | * | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)gkodinov/kgeorge@macbook.gmz2008-03-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bool data type was redefined to BOOL (4 bytes on windows). Removed the #define and fixed some of the warnings that were uncovered by this. Note that the fix also disables 2 warnings : 4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning) 4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation These warnings will be handled in a separate bug, as they are performance related or bogus. Fixed to int the return type of functions that return more than 2 distinct values.
| * | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsiggy@alf.(none)2008-02-271-0/+8
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| into alf.(none):/src/macro_bugs/my51-macro_bugs
| | * | Bug #23839 Multiple declarations of macrosiggy@alf.(none)2008-02-271-0/+8
| | |/ | | | | | | | | | - Remove duplicate macro defintions.
* | | Windows fixeds for mtrmsvensson@pilot.mysql.com2007-12-191-0/+1
|/ /
* | Merge alf.(none):/src/bug31319/my50-bug31319iggy@alf.(none)2007-11-021-0/+2
|\ \ | |/ | | | | into alf.(none):/src/bug31319/my51-bug31319
| * Bug#31319 CMake build does not check for minimum required versioniggy@alf.(none)2007-11-021-0/+2
| | | | | | | | - Add check
* | Merge alf.(none):/src/bug31289/my50-bug31289iggy@alf.(none)2007-10-081-8/+9
|\ \ | |/ | | | | into alf.(none):/src/bug31289/my51-bug31289
| * Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifestiggy@alf.(none)2007-10-081-8/+9
| | | | | | | | | | tool error - Move disable manifest generation commands to more global location.
* | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:kent@mysql.com/kent-amd64.(none)2007-08-061-25/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | Post Merge Fixup.iggy@amd64.(none)2007-08-041-19/+18
| |
* | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-041-3/+3
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
| * CMakeLists.txt:kent@mysql.com/kent-amd64.(none)2007-08-041-14/+14
| | | | | | | | Removed space between '-D' and symbol
* | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-031-28/+33
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
| * CMakeLists.txt, README, configure.jskent@mysql.com/kent-amd64.(none)2007-08-031-59/+37
| | | | | | | | | | Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
| * Bug#24732 Executables do not include Vista manifestsiggy@amd64.(none)2007-07-251-6/+32
| | | | | | | | - Sign executables with MySQL AB security certificate.
| * BUG#20815 Errno 12 on Windows after 197 connectionsdf@pippilotta.erinye.com2007-07-191-0/+3
| |
| * Bug#24732 Executables do not include Vista manifestsiggy@amd64.(none)2007-06-261-1/+1
| | | | | | | | - Corrected manifest attributes.
| * Bug #24732 Executables do not include Vista manifestsiggy@amd64.(none)2007-06-011-1/+1
| | | | | | | | | | - Cleanup typo. - Make sure to only embedded four part numberic version.
| * BUG#24732 manifest file was not included in VS2005 amd64 buildsdf@pippilotta.erinye.com2007-05-041-0/+5
| |
View Lorry Controller Status