summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* MSI package: always install new component "Common" (currently consists of ↵Vladislav Vaintroub2012-05-301-1/+2
| | | | charset directory)
* mergeSergei Golubchik2012-05-052-2/+15
|\
| * 5.3 mergeSergei Golubchik2012-05-042-2/+15
| |\
| | * mergeVladislav Vaintroub2012-05-022-2/+15
| | |\
| | | * MDEV233 - Support Wix3.6 for MSIVladislav Vaintroub2012-04-252-2/+15
| | | |
* | | | support same version upgrade for MSIVladislav Vaintroub2012-05-042-4/+7
|/ / /
* | | mergeVladislav Vaintroub2012-04-172-3/+89
|\ \ \ | |/ /
| * | mergeVladislav Vaintroub2012-04-161-6/+7
| |\ \ | | |/
| | * fix compiler warningsVladislav Vaintroub2012-04-161-6/+7
| | |
| * | mergeVladislav Vaintroub2012-04-162-3/+88
| |\ \ | | |/
| | * MDEV-221 - Properly escape command line when starting mysql_install_db Vladislav Vaintroub2012-04-162-3/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since password characters can contain quotes or spaces. The proper quoting method for command line arguments used here was extracted from http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx Additionally, mysql_install_db.exe now passes root password to "mysqld.exe --bootstrap" in hexadecimal form, to handle potential special chars inside password string literal.
* | | Add minimal clarication about 'root' user to the installer UIVladislav Vaintroub2012-04-151-2/+2
| | |
* | | Merge 5.3->5.5Igor Babaev2012-03-172-3/+8
|\ \ \ | |/ /
| * | 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.
* | | 5.3.4 mergeSergei Golubchik2012-02-151-1/+1
|\ \ \ | |/ /
| * | 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
| | | | |\
* | | | | | MDEV-33 : removed unused files in win/Vladislav Vaintroub2012-01-106-246/+0
| | | | | |
* | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-263-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI - add some missing headers to windows specific source files. This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h no more includes whiole Windows - do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they are not needed. Do not build resolveip on Windows, it is not used. - precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests to speed up cmake run with VS) - make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin), fix null pointer access in PSI_register
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-223-3/+63
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | | | |
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-1/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-303-3/+5
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | | | | |
* | | | | | | merge with 5.3Sergei Golubchik2011-10-1931-0/+4066
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | | | | | 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
View Lorry Controller Status