summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-215-5/+7
|\ | | | | | | Fixed up copyright messages.
| * Updated/added copyright headersKent Boortz2011-07-032-0/+36
| |\
| * \ Updated/added copyright headersKent Boortz2011-06-303-3/+5
| |\ \
| | * | Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | |
* | | | support for plugins on windowsSergei Golubchik2011-10-044-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists.txt: 1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt don't force plugins to copy-paste these lines in their CMakeLists.txt 2.1 search plugin/* for plugins (not only storage/*), 2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE), 2.3 extract library names from the plug.in (don't force library names to be ha_<engine>.dll and <engine>.lib) include/mysql/plugin.h: define MYSQL_PLUGIN_EXPORT appropriately (backport from 5.5) libmysqld/CMakeLists.txt: remove unnecessary workaround plugin/fulltext/CMakeLists.txt: build fulltext example plugin on windows storage/maria/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/maria/unittest/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/myisam/CMakeLists.txt: The library is called libmyisam_s.lib, not myisam.lib storage/mysql_storage_engine.cmake: introduce MYSQL_PLUGIN macro. don't force library names to be ha_<engine>.dll and <engine>.lib storage/xtradb/CMakeLists.txt: remove a condition from include win/README: don't use deprecated syntax win/configure-mariadb.sh: don't use deprecated syntax win/configure.js: 1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE. 2. support plugin/* in addition to storage/*
* | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-022-0/+36
|\ \ \ \ | | |_|/ | |/| | | | | | Moved some BSD string functions from Unireg
| * | | Added support for VS10.Georgi Kodinov2011-03-282-0/+36
| |/ / | | | | | | | | | | | | Fixed RelWithDebugInfo bzr ignores.
* | | 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
| * | MergeKent Boortz2010-12-292-0/+29
| |\ \ | | |/
| | * - Added/updated copyright headersKent Boortz2010-12-282-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed files specific to compiling on OS/2 - Removed files specific to SCO Unix packaging - Removed "libmysqld/copyright", text is included in documentation - Removed LaTeX headers for NDB Doxygen documentation - Removed obsolete NDB files - Removed "mkisofs" binaries - Removed the "cvs2cl.pl" script - Changed a few GPL texts to use "program" instead of "library"
| | * bug#27693: Windows compilation from bk fails using WITH_BERKELEY_STORAGE_ENGINEJonathan Perkin2009-09-301-1/+15
| | | | | | | | | | | | | | | | | | Make configure.js bail with an error if trying to build bdb from a bzr tree.
| | * Updates to build with community features enabled for community builds.MySQL Build Team2009-05-201-0/+1
| | |
| | * Auto merge 5.0-build -> 5.0-bugteamTimothy Smith2008-09-101-1/+11
| | |\
| * | | 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
* | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | build mysqld.exe with federatedx not federatedSergei Golubchik2010-10-201-1/+1
| | | |
* | | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed to still use bcmp() in certain cases becasue - Faster for short unaligneed strings than memcmp() - Bettern when using valgrind - Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems - Changed code to use MariaDB version of select->skip_record() - Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
* | | | Add 64 bit packages to the pack script. 32 bit is still the defaultBo Thorsen2010-07-071-5/+56
| | | |
* | | | Install MariaDB as a service with the installerBo Thorsen2010-06-301-0/+995
| | | |
* | | | Fix short version numberBo Thorsen2010-05-261-3/+2
| | | |
* | | | Fix a couple of problems in the pack script, and disable a check feature ↵Bo Thorsen2010-05-251-20/+20
| | | | | | | | | | | | | | | | that doesn't work right now
* | | | Add a -nobuild argument to the script. Useful for building the zip file ↵Bo Thorsen2010-05-141-4/+6
| | | | | | | | | | | | | | | | release with Express Edition which doesn't have the devenv command
* | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-3/+3
|\ \ \ \ | |/ / /
| * | | Adjuster the parsing of "configure.in" version number lineKent Boortz2010-02-031-3/+3
| | | |
* | | | Dummy change to push the release tag.Sergey Petrunya2009-10-301-1/+1
| | | |
* | | | Cosmetic fixes to win/make_mariadb_win_distSergey Petrunya2009-10-121-1/+2
| | | |
* | | | Fix typo bug in make_mariadb_win_distSergey Petrunya2009-10-121-1/+1
| | | |
* | | | Fix win32 binary zipfile name and contents to match the usual expectationsSergey Petrunya2009-10-121-6/+19
| | | |
* | | | Fix typo bug, s/$ZIPFILE/$ZIPNAME/Sergey Petrunya2009-10-121-1/+2
| | | |
* | | | Remove leftover "echo"Sergey Petrunya2009-10-121-1/+1
| | | |
* | | | Make devenv print the build log to stdout (otherwise buildbot times out Sergey Petrunya2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | while waiting for output): attempt 2
* | | | Make devenv print the build log to stdout (otherwise buildbot times out Sergey Petrunya2009-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | while waiting for output)
* | | | Add win/make_mariadb_win_dist which is to be used to make windowsSergey Petrunya2009-10-112-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | binary distribution zips.
* | | | Include configure-mariadb.sh in source tarballSergey Petrunya2009-10-081-1/+1
| | | |
* | | | Added win/configure-mariadb.sh - the standard way to configure on Windows.Sergey Petrunya2009-10-081-0/+23
| | | |
* | | | Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)Sergey Petrunya2009-10-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Part 2. make it really work.
* | | | Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)Sergey Petrunya2009-10-071-0/+3
| | | |
* | | | Add missing windows files to `make dist`.unknown2009-10-021-1/+2
| | | |
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-083-10/+365
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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.
| * | | Fixed build failures.Sergey Vojtovich2009-06-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/innodb_plugin/Makefile.am: Removed handler0vars.h from source distribution. win/Makefile.am: Fixed incorrect merge.
| * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-103-8/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Bug #44353 build-v9.bat is missing in source archiveAnurag Shekhar2009-04-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entry for build-vs9.bat and build-vs9_x64.bat was missing in win/Makefile.am. Added the entries to fix the problem. win/Makefile.am: Added entry for build-vs9.bat and build-vs9_x64.bat in EXTRA_DIST.
* | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Contains fixes for test cases Changed release tag to beta configure.in: change release tag to beta
| * | | Bug#38784: Mysql server crash if table is altered with partition changes.Mattias Jonsson2008-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. CMakeLists.txt: Bug#38784: Mysql server crash if table is altered with partition changes. Added support for EXTRA_DEBUG sql/sql_partition.cc: Bug#38784: Mysql server crash if table is altered with partition changes. Changed from FN_LEN to FN_REFLEN since the variable was use for paths, not filenames without path. win/configure.js: Bug#38784: Mysql server crash if table is altered with partition changes. Added support for EXTRA_DEBUG
| * | | Auto merge 5.1-build -> 5.1-bugteamTimothy Smith2008-09-101-1/+11
| |\ \ \
* | \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, ↵Guilhem Bichot2008-11-211-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or mysql-test/t/*myisam*. However there were three new tests mysql-test/suite/parts/t/partition*myisam.test, of which I make here copies for Maria.
| * \ \ \ \ Merge main 5.1 branch -> 5.1-build (team tree).Joerg Bruehe2008-10-042-0/+36
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| * | | | Merge from mysql-5.0-buildKent Boortz2008-08-291-1/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Handle that version "level" might contain "sp1", "a".....Kent Boortz2008-08-291-1/+11
| | | | |
* | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-102-0/+36
|\ \ \ \ \ | | |_|/ / | |/| | |
View Lorry Controller Status