summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Fix XtraDB LPBug #714143 : Vladislav Vaintroub2011-06-121-1/+1
| | | | | | | | | Windows native async io is disabled. The patch uses completion ports for asynchronous IO notification , instead of formerly used notification via event . This also removes the limit of 64 async IOs per background IO thread (this limit was forced by using WaitForMultipleObjects in previous AIO implementation)
* Small CMake fixes :Vladislav Vaintroub2011-05-151-9/+1
| | | | | | | - add version info for the client library, dynamic plugins and some utilities - do not recompile client library sources 3 times (for mysqlclient , mysqlclient_notls and libmysql) One time is sufficient, so get rid of mysqlclient_notls, and link static client library to the shared. - remove incremental linking flag
* fix noisy warnings in header filesVladislav Vaintroub2011-05-041-1/+0
|
* Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+1
|\
| * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+1
| |\ | | | | | | | | | Moved some BSD string functions from Unireg
| | * fixing 38697/11749301MySQL Build Team2011-03-211-0/+1
| | |
* | | merge 5.2Vladislav Vaintroub2011-03-101-2/+1
|\ \ \
| * \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-2/+1
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.55Michael Widenius2011-02-201-2/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| | | * 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
* | | | On Philips request, introduce a variableVladislav Vaintroub2011-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | BUILD_RELEASE to disable graceful fallbacks if WiX or MFC is not available.
* | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-136/+73
|/ / / | | | | | | | | | to be able to build MSI based installer
* | | mergeVladislav Vaintroub2010-12-061-0/+9
|\ \ \ | |/ /
| * | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC flag, while anything else is compiled with SAFEMALLOC. As a consequence, my_hash_init used inside federatedx initialization does not provide correct caller info parameters (file, line) , so they are initialized with whatever is on stack. When info about allocated memory is output in COM_DEBUG command, the server crashes trying to output string starting at 0xcccccccccccccccc. The fix is to remove SAFEMALLOC preprocessor flags from every CMakeLists.txt, except the top-level one. Also, SAFEMALLOC is not defined by default now, instead there is WITH_DEBUG_FULL CMake option which adds -DSAFEMALLOC to C and C++ flags in debug compilation. This option is off by default, because 1) Debug C runtime already has heap debugging builtin with overwrite and leak detection 2)safemalloc considerably slows down the tests. Note also that - SAFEMALLOC is gone in MySQL5.5 - On Windows, heap related overflows can also be found using free pageheap utility (that is also part of application verifier). This is even more efficient if there are no other layers on top of Windows heap allocator, e.g it is most efficient with release version.
* | | Merge with 5.1Michael Widenius2010-12-041-1/+1
|\ \ \ | |/ /
| * | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010). Remove map files from packaging. - Fix warning about ETIMEDOUT being redefined. - Fix warning about FSP_EXTENT_SIZE in xtradb (32/64 bit right shift mismatch) - Silence warnings coming from generated code (flex/bison) in xtradb/innodb_plugin. - Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
* | | rename maria to ariaSergei Golubchik2010-09-121-5/+5
| | |
* | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+123
|\ \ \ | |/ /
| * | Hardcode the build path for the installer temporarilyBo Thorsen2010-07-011-5/+0
| | |
| * | Fix cpack runBo Thorsen2010-07-011-0/+5
| | |
| * | Install MariaDB as a service with the installerBo Thorsen2010-06-301-0/+3
| | |
| * | Install MTR and SQL-bench with CPack and NSISBo Thorsen2010-06-291-2/+44
| | |
| * | Install the files for the embedded serverBo Thorsen2010-06-281-2/+5
| | |
| * | Fix a loop and install more script files. Renames the perlscripts component ↵Bo Thorsen2010-06-281-6/+6
| | | | | | | | | | | | to scripts, since it now also has sql scripts.
| * | Fix installing the localized error messages with cpackBo Thorsen2010-06-281-6/+6
| | |
| * | Implement an NSIS based installerBo Thorsen2010-06-251-0/+75
| | |
* | | Make MariaDB compile with VS 2010Hakan Kuecuekyilmaz2010-06-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the changes are backports from MySQL 5.5. Please note that the 64-bit build fails with VS 2010 and the 32-bit build has problems running mysql-test-run.pl. * Added files for compiling with VS 2010 and added them to Makefile.am. * ifdef'ed ETIMEDOUT, because it is defined by VS 2010 now * Removed not needed /MAP's from cmake files
* | | mergedSergei Golubchik2010-06-161-1/+0
|\ \ \ | |/ /
| * | Remove a warning on Windows. There is no CMakeLists.txt in the unittest ↵Bo Thorsen2010-06-141-1/+0
| | | | | | | | | | | | examples dir
* | | fixes for windows buildsSergei Golubchik2010-04-021-0/+1
| | |
* | | Maria WL#61unknown2010-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interface for maria extensions. Alternative plugin interface with additional info (maturity and string version). CMakeLists.txt: Maria plugin interface used. config/ac-macros/plugins.m4: Maria plugin interface used. configure.in: Maria plugin interface used. include/mysql/plugin.h: Maria plugin interface added. include/mysql/plugin_auth.h.pp: Maria plugin interface added. plugin/auth/auth_socket.c: Maria plugin interface added. plugin/auth/dialog.c: Maria plugin interface added. plugin/daemon_example/daemon_example.cc: Maria plugin interface added. plugin/fulltext/plugin_example.c: Maria plugin interface added. sql/ha_ndbcluster.cc: Maria plugin interface added. sql/ha_partition.cc: Maria plugin interface added. sql/log.cc: Maria plugin interface added. sql/sql_acl.cc: Maria plugin interface added. sql/sql_builtin.cc.in: Maria plugin interface used. sql/sql_plugin.cc: Maria plugin interface added. sql/sql_plugin.h: Maria plugin interface used. sql/sql_show.cc: Maria plugin interface added. storage/archive/ha_archive.cc: Maria plugin interface added. storage/blackhole/ha_blackhole.cc: Maria plugin interface added. storage/csv/ha_tina.cc: Maria plugin interface added. storage/example/ha_example.cc: Maria plugin interface added. storage/federated/ha_federated.cc: Maria plugin interface added. storage/federatedx/ha_federatedx.cc: Maria plugin interface added. storage/heap/ha_heap.cc: Maria plugin interface added. storage/ibmdb2i/ha_ibmdb2i.cc: Maria plugin interface added. storage/innobase/handler/ha_innodb.cc: Maria plugin interface added. storage/innodb_plugin/handler/i_s.cc: Maria plugin interface added. storage/maria/ha_maria.cc: Maria plugin interface added. storage/myisam/ha_myisam.cc: Maria plugin interface added. storage/myisammrg/ha_myisammrg.cc: Maria plugin interface added. storage/pbxt/src/ha_pbxt.cc: Maria plugin interface added. storage/xtradb/handler/ha_innodb.cc: Maria plugin interface added. storage/xtradb/handler/i_s.cc: Maria plugin interface added. storage/xtradb/handler/i_s.h: Maria plugin interface added.
* | | mwl:98 - libservicesSergei Golubchik2010-03-031-0/+1
|/ /
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-2/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved some code from innodb_plugin to xtradb, to ensure that all tests runs - Did changes in pbxt and maria storage engines becasue of changes in thd->query - Reverted wrong code in sql_table.cc for how ROW_FORMAT is used. This is a re-commit of Monty's merge to eliminate an extra commit from MySQL-5.1.42 that was accidentally included in the merge. This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In case there are any extra changes done before final MySQL 5.1.41 release, these will need to be merged later before MariaDB 5.1.41 release.
| * 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. .bzrignore: WL#4259 - Debug Sync Facility Added the symbolic link libmysqld/debug_sync.cc. CMakeLists.txt: WL#4259 - Debug Sync Facility Added definition for ENABLED_DEBUG_SYNC. configure.in: WL#4259 - Debug Sync Facility Added definition for ENABLED_DEBUG_SYNC. include/my_sys.h: WL#4259 - Debug Sync Facility Added definition for the DEBUG_SYNC_C macro. libmysqld/CMakeLists.txt: WL#4259 - Debug Sync Facility Added sql/debug_sync.cc. libmysqld/Makefile.am: WL#4259 - Debug Sync Facility Added sql/debug_sync.cc. mysql-test/include/have_debug_sync.inc: WL#4259 - Debug Sync Facility New include file. mysql-test/mysql-test-run.pl: WL#4259 - Debug Sync Facility Added option --debug_sync_timeout. mysql-test/r/debug_sync.result: WL#4259 - Debug Sync Facility New test result. mysql-test/r/have_debug_sync.require: WL#4259 - Debug Sync Facility New require file. mysql-test/t/debug_sync.test: WL#4259 - Debug Sync Facility New test file. mysys/my_static.c: WL#4259 - Debug Sync Facility Added definition for debug_sync_C_callback_ptr. mysys/thr_lock.c: WL#4259 - Debug Sync Facility Added sync point "wait_for_lock". sql/CMakeLists.txt: WL#4259 - Debug Sync Facility Added debug_sync.cc and debug_sync.h. sql/Makefile.am: WL#4259 - Debug Sync Facility Added debug_sync.cc and debug_sync.h. sql/debug_sync.cc: WL#4259 - Debug Sync Facility New source file. sql/debug_sync.h: WL#4259 - Debug Sync Facility New header file. sql/mysqld.cc: WL#4259 - Debug Sync Facility Added opt_debug_sync_timeout. Added calls to debug_sync_init() and debug_sync_end(). Fixed a purecov comment (unrelated). sql/set_var.cc: WL#4259 - Debug Sync Facility Added server variable "debug_sync". sql/set_var.h: WL#4259 - Debug Sync Facility Added declaration for server variable "debug_sync". sql/share/errmsg.txt: WL#4259 - Debug Sync Facility Added error messages ER_DEBUG_SYNC_TIMEOUT and ER_DEBUG_SYNC_HIT_LIMIT. sql/sql_base.cc: WL#4259 - Debug Sync Facility Added sync points "after_flush_unlock" and "before_lock_tables_takes_lock". sql/sql_class.cc: WL#4259 - Debug Sync Facility Added initialization for debug_sync_control to THD::THD. Added calls to debug_sync_init_thread() and debug_sync_end_thread(). sql/sql_class.h: WL#4259 - Debug Sync Facility Added element debug_sync_control to THD. storage/myisam/myisamchk.c: Fixed a typo in an error message string (unrelated).
| * Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-141-0/+1
| |
* | Fix embedded build on Windows: contents of storage/xtradb think they areSergey Petrunya2009-10-031-0/+4
| | | | | | | | | | | | 'innobase'.
* | MySQL 5.1 -> Maria 5.1 merge: Fix windows buildSergey Petrunya2009-09-161-2/+10
| | | | | | | | | | | | | | | | | | - Fix XtraDB to be built as a static library. storage/xtradb/buf/buf0flu.c: Fix previous merge error (was harmless except for on win32) storage/xtradb/plug.in: Make it sync with innobase/plug.in.disabled
* | MySQL 5.1 -> MariaDB 5.1 merge: windows build fixesSergey Petrunya2009-09-151-0/+1
| |
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-83/+112
|\ \ | |/ | | | | | | | | | | * Finished Monty and Jani's merge * Some InnoDB tests still fail (because it's old xtradb code run against newer testsuite). They are expected to go after mergning with the latest xtradb.
| * 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. storage/innodb_plugin/handler/ha_innodb.cc: Remove a Win32 workaround for current_thd. The original problem that innodb plugin used value of TLS variable across DLL boundaries is solved in MySQL server (current_thd is a function not TLS variable now) storage/innodb_plugin/handler/handler0alter.cc: Remove custom delay loader storage/innodb_plugin/handler/handler0vars.h: Remove custom delay loader storage/innodb_plugin/handler/i_s.cc: Remove custom delay loader storage/innodb_plugin/handler/win_delay_loader.cc: Remove custom delay loader storage/innodb_plugin/plug.in: Remove commented out MYSQL_PLUGIN_STATIC, CMake would not parse that correctly
| * | 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
| | |
View Lorry Controller Status