summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.2->5.3unknown2012-03-142-3/+8
|\
| * LP947631: Uninstall wipes HeidiSQL settings, even if HeidiSQL is installed ↵Vladislav Vaintroub2012-03-062-3/+8
| | | | | | | | | | | | | | | | prior to MariaDB Fixed detection of installed HeidiSQL in the machine, prevent installing own copy if HeidiSQL is already installed. On deinstallation, do not remove settings if official HeidiSQL is detected.
* | mergeVladislav Vaintroub2012-02-121-1/+1
|\ \ | |/
| * Use newly released HeidiSQL 7.0 in the MSI installerVladislav Vaintroub2012-02-121-1/+1
| |
* | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-011-1/+1
|\ \ | |/
| * MDEV-50 : Fix default compilation commentVladislav Vaintroub2012-01-101-1/+1
| |
* | Merge with 5.2.Michael Widenius2011-12-113-3/+5
|\ \ | |/ | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| * Merge with MariaDB 5.1Michael Widenius2011-11-243-3/+5
| |\
| | * 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
| | | | | |
* | | | | | mergeVladislav Vaintroub2011-10-121-2/+60
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add option to enable feedback plugin to the MSI installer.Vladislav Vaintroub2011-10-121-2/+60
| | | | | |
* | | | | | mergeSergei Golubchik2011-10-114-12/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge with 5.1Sergei Golubchik2011-10-074-12/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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.
* | | | | mergeVladislav Vaintroub2011-09-161-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix path lookup for singtoolVladislav Vaintroub2011-09-161-1/+2
| | | | |
* | | | | LPBUG#779758 - fix missing alpha/beta etc in MSI and ZIP package names.Vladislav Vaintroub2011-06-172-4/+14
|/ / / /
* | | | After talking to HeidiSQL people - libmysql.dll that comes with their ↵Vladislav Vaintroub2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | distribution in place, dont replace with our own. It also will result in less HeidiSQL restarts during MariaDB upgrades (since libmysql.dll won't be replaced)
* | | | Fix a problem building MSI using localized (Spanish) Visual Studio 2010.Vladislav Vaintroub2011-06-082-3/+1
| | | | | | | | | | | | | | | | | | | | VS did not like to execute 2 commands in custom build step, workaround is to use single COMMAND instead of 2.
* | | | use our libmysql.dll with HeidiSQL, if we compile 32 bitVladislav Vaintroub2011-06-022-3/+13
| | | |
* | | | Use our libmysql.dll with Heidi, if we compile 32 bitVladislav Vaintroub2011-06-014-22/+40
| | | |
* | | | MWL#200 - provide options to install 3rd party components.Vladislav Vaintroub2011-06-017-0/+144
| | | | | | | | | | | | | | | | | | | | Added HeidiSQL as example, i.e cmake -DWITH_THIRD_PARTY=HeidiSQL and building MSI will bundle HeidiSQL.
* | | | Workaround a cmake bug that was only visible on a newly installed Philip's ↵Vladislav Vaintroub2011-05-271-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | machine. CMake 2.8.4 crashed on this line IF(something AND IS_DIRECTORY(something_else)) when both "something" and "something_else" were empty. Changing the line slightly (using cascading "IF" instead) solved the crash.
* | | | Cygwin-specific klugde to workaround missing TEMP/TMP variables.Vladislav Vaintroub2011-05-101-0/+1
| | | |
* | | | enable 'Optimized for transactions'configuration checkbox if innodb is ↵Vladislav Vaintroub2011-04-084-20/+257
| | | | | | | | | | | | | | | | compiled in
* | | | Add optional CMake parameter TINY_VERSION. Vladislav Vaintroub2011-03-292-4/+8
| | | | | | | | | | | | | | | | | | | | Parameter setting has the effect on 4th part of the version string in executable's version info on Windows. It could be set e.g to bzr revno to uniquely identify different builds for the same major.minor.patch combo.
* | | | Sign MSI if code signing is requested.Vladislav Vaintroub2011-03-281-2/+1
| | | | | | | | | | | | | | | | | | | | Remove SIGNCODE_ENABLED variable from create_msi.cmake.in, it was already removed from other places.
* | | | CMake fixes for buildbot/MSI package building and signing:Vladislav Vaintroub2011-03-282-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FIND_PROGRAM (signtool) will now get a hint about location of signtool.exe (Windows SDK) - Targets "package" or "msi" will now fail, l if signing is requested but does not work (e.g invalid certificate) - During install, do not re-sign binaries, if they are already signed. - Preserve mysqld_error.h timestamp whenever possible. This helps avoiding situations where the whole server is rebuilt, whenever comp_err.exe changes (for example after code signing, or also after a minor fix in mysys) - Fix Wix error in UpgradeVersion, if patch part of the version is 0.
* | | | merge 5.2Vladislav Vaintroub2011-03-102-3/+2
|\ \ \ \
| * | | | pass WITH_ARIA_STORAGE_ENGINE to configure.jsVladislav Vaintroub2011-03-071-1/+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
| | | * | 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
* | | | | | MWL#55 : address Philip's final review comments : Vladislav Vaintroub2011-02-143-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rename upgrade_wizard.exe to mysql_upgrade_wizard.exe - have shortcut to upgrade wizard in the menu folder
* | | | | | MWL#55 : Adjust UI according to some user's expectations.Vladislav Vaintroub2011-02-072-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If upgradable instances are found, bring a new dialog to inform user about it. This gives user a chance to deselect "database instance" feature early, because experience shows nobody really looks at features and their in their description in "customize setup" dialog. This also tells user that existing instances can be upgraded.
* | | | | | MWL#55 :Vladislav Vaintroub2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow MSI and NSIS side-by-side installation if installed NSIS package differs in "major.minor" version numbers. Still disallow MSI and NSIS if major.minor versions of both packages match.
* | | | | | On Philips request, introduce a variableVladislav Vaintroub2011-02-032-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD_RELEASE to disable graceful fallbacks if WiX or MFC is not available.
* | | | | | MWL#55 : force per-machine installation.Vladislav Vaintroub2011-02-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: user without privileges can have an half-complete installation, if he manages to click on "Ignore" for all errors in the installer. As a result, he will miss ARP registry keys, and uninstall will not be possible using "Add/Remove Programs" applet.
* | | | | | AssignProcessToJobObject cannot assign current processVladislav Vaintroub2011-02-021-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Win7 with the most strict user account control setting (secure desktop) Fix: use job object for child process only, not for current process itself.
* | | | | | add some forgotten jpgsVladislav Vaintroub2011-01-302-0/+0
| | | | | |
View Lorry Controller Status