summaryrefslogtreecommitdiff
path: root/win
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-06-283-4/+9
|\
| * Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-212-13/+7
| |\
| | * MDEV-10117 - update HeidiSQL to current versionVladislav Vaintroub2016-05-241-1/+1
| | * MDEV-10071 Block installation on XP/Windows 2003 Server(they are no more supp...Vladislav Vaintroub2016-05-241-0/+3
| | * MDEV-10108 Fix errors in installations by domain userVladislav Vaintroub2016-05-241-1/+3
| | * MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
| * | MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ins...Vladislav Vaintroub2016-05-241-2/+2
* | | MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
* | | MDEV-9659 : AWS KMS encryption pluginVladislav Vaintroub2016-03-131-2/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-3/+0
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-3/+0
| |\ \ | | |/
| | * MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-062-57/+45
* | | MDEV 4691- address review commentsVladislav Vaintroub2016-01-191-13/+8
* | | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2015-11-192-5/+5
|\ \ \ | |/ / |/| |
| * | Commit resolved conflictsOlivier Bertrand2015-09-183-2/+6
| |\ \
| | * \ Merge branch '10.0' into 10.1Sergei Golubchik2015-09-032-1/+6
| | |\ \
| | * \ \ Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+0
| | |\ \ \
| * | \ \ \ 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
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-072-2/+28
| | |\ \ \ \
| * | | | | | commit win/ changesOlivier Bertrand2015-06-0516-1870/+1870
| |/ / / / /
| * | | | | fix for cmake builds on windowsSergei Golubchik2015-02-101-2/+2
* | | | | | MDEV-9024 Build fails with VS2015Vladislav Vaintroub2015-11-062-58/+44
* | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | fixes for buildbot:mariadb-5.5.46Sergei Golubchik2015-10-091-0/+2
* | | | | MDEV-8296 MSVS 2013 & WiX 3.9Sergei Golubchik2015-08-012-1/+6
| |_|_|/ |/| | |
* | | | 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
* | | | Fix win/ files to be stored with LF in repositorymariadb-10.0.1910.0-defragmentVicentiu Ciorbaru2015-05-0814-862/+862
* | | | convert files from CRLF to LF line endingsSergei Golubchik2015-05-082-1034/+1034
| |_|/ |/| |
* | | 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
* | MDEV-7531 Update 10.0.15 to 10.0.16 -> Error 2003 (HY000) can't connect to My...Sergei Golubchik2015-01-301-8/+8
* | 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
|\ \ | |/
| * 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
| * MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even if...Vladislav Vaintroub2013-04-302-5/+8
* | Fix to handle CMake component names with dash in the name, when producing MSI...Vladislav Vaintroub2013-04-192-22/+26
* | Fix MSI package creation for connect engine.Vladislav Vaintroub2013-04-171-1/+7
* | 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 mysql...Vladislav Vaintroub2012-12-211-0/+1
* | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+20
|\ \ \ \ \ | |/ / / /