summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* Commit resolved conflictsOlivier Bertrand2015-09-183-2/+6
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2015-09-032-1/+6
| |\ | | | | | | | | | | | | referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera
| | * MDEV-8296 MSVS 2013 & WiX 3.9Sergei Golubchik2015-08-012-1/+6
| | | | | | | | | | | | | | | | | | Support for VS2013 and WiX 3.9 (patch by Andrey Kuznetsov)
| * | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+0
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-1/+0
| | |\
| | | * Fix win/ files to be stored with LF in repositoryVicentiu Ciorbaru2015-05-0816-1890/+1890
| | | | | | | | | | | | | | | | | | | | On Windows, the files get checked out with CRLF thanks to .gitattributes.
| | * | Fix win/ files to be stored with LF in repositorymariadb-10.0.1910.0-defragmentVicentiu Ciorbaru2015-05-0814-862/+862
| | | | | | | | | | | | | | | | | | | | On Windows, the files get checked out with CRLF thanks to .gitattributes.
| | * | convert files from CRLF to LF line endingsSergei Golubchik2015-05-082-1034/+1034
| | | |
* | | | Commit win and CONNECT resolved filesOlivier Bertrand2015-06-052-7/+33
|\ \ \ \ | |/ / /
| * | | Fix win/ files to be stored with LF in repositoryVicentiu Ciorbaru2015-05-0816-1896/+1896
| | | | | | | | | | | | | | | | | | | | On Windows, the files get checked out with CRLF thanks to .gitattributes.
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-072-2/+28
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-182-2/+28
| | |\ \ | | | |/
| | | * MDEV-7290 please update MSI installer to include HeidiSQL 9.1Sergei Golubchik2015-02-112-2/+28
| | | |
| | | * MDEV-6891: Update company nameNirbhay Choubey2014-12-121-1/+1
| | | |
* | | | commit win/ changesOlivier Bertrand2015-06-0516-1870/+1870
|/ / /
* | | fix for cmake builds on windowsSergei Golubchik2015-02-101-2/+2
|/ /
* | MDEV-7531 Update 10.0.15 to 10.0.16 -> Error 2003 (HY000) can't connect to ↵Sergei Golubchik2015-01-301-8/+8
| | | | | | | | | | | | MySql server. use the old registry branch, even if we changed the "manufacturer" string
* | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-1/+1
| |
* | 5.5.38 mergeSergei Golubchik2014-06-061-2/+2
|\ \ | |/
| * MDEV-6271 update MSI installer to include latest Version of HeidiSQL (8.3.x.x)Sergei Golubchik2014-05-271-2/+2
| |
* | 10.0-base mergeSergei Golubchik2013-06-063-7/+12
|\ \ | |/ | | | | (without InnoDB - all InnoDB changes were ignored)
| * remove start menu shortcut to upgrade wizardVladislav Vaintroub2013-05-191-0/+2
| |
| * MDEV-4544 : Update MSI installer to use latest HeidiSQL 8.0Vladislav Vaintroub2013-05-191-1/+1
| |
| * Small mysql_install_db.exe fixesVladislav Vaintroub2013-05-091-1/+1
| | | | | | | | | | - Use lc-messages-dir instead of deprecated --language when running mysqld in bootstrap mode. - Add some verbosity to mysql_install_db.exe when it runs in course of MSI installation.
| * MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even ↵Vladislav Vaintroub2013-04-302-5/+8
| | | | | | | | | | | | | | if there are upgradable instances (i.e windows service of lower MariaDB/MySQL version) The main reason for he error is misplaced ADD_DIRECTORY in top-level CMakeLists.txt. ADD_DIRECTORY(win/packaging) was places before win/upgrade_wizard, and MSI was not able to detect that upgrade wizard was built, and thus excluded upgrade wizard entirely.
* | Fix to handle CMake component names with dash in the name, when producing ↵Vladislav Vaintroub2013-04-192-22/+26
| | | | | | | | | | | | | | MSI package. Rename connect_engine component back to connect-engine.
* | Fix MSI package creation for connect engine.Vladislav Vaintroub2013-04-171-1/+7
| | | | | | | | | | | | Also, do not use /MP option when compiling CONNECT (incompatible with COM #import directive) Also, fix ODBC_LIBRARY to be a list on Windows, not string with spaces inside.
* | 10.0-base mergeSergei Golubchik2013-01-311-0/+1
|\ \ | |/
| * 5.3 mergeSergei Golubchik2013-01-151-0/+1
| |\
| | * 5.2->5.3 mergeSergei Golubchik2013-01-101-0/+1
| | |\
| | | * mergeVladislav Vaintroub2012-12-211-0/+1
| | | |\
| | | | * Support VS2012. Exclude compiler-defined symbols from being exported by ↵Vladislav Vaintroub2012-12-211-0/+1
| | | | | | | | | | | | | | | | | | | | mysqld.exe
* | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Also fixed a bug in sql_update.cc: the code of mysql_update() lacked a call of set_statistics_for_table().
| * | | | MDEV-3993 - add MSI installer option to set character-set-server=utf8Vladislav Vaintroub2013-01-011-0/+20
| | | | |
* | | | | Trigger pusbuild buildVladislav Vaintroub2012-11-111-1/+2
|/ / / /
* | | | 5.3 mergeSergei Golubchik2012-08-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge from 5.2.unknown2012-08-241-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-484 : allow compilation/packaging on Windows with newly released VS2012Vladislav Vaintroub2012-08-241-1/+1
| | | |
* | | | 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
| | | |
View Lorry Controller Status