Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 2 | -0/+0 |
|\ | |||||
| * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 2 | -0/+0 |
| |\ | |||||
| | * | MDEV-14446 followup | Vladislav Vaintroub | 2018-01-18 | 1 | -0/+0 |
| | * | MDEV-14446 Windows installer still uses the old brown logo | Vladislav Vaintroub | 2018-01-18 | 2 | -0/+0 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -1/+44 |
|\ \ \ | |/ / | |||||
| * | | Windows MSI : dump server error log to MSI log on installation failure. | Vladislav Vaintroub | 2017-10-03 | 1 | -1/+44 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-08-28 | 1 | -14/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove workaround for ancient and already fixed CMake bug in MSI creation. | Vladislav Vaintroub | 2017-08-23 | 1 | -14/+0 |
* | | | MDEV-13106 : Fix check for empty directory in MSI installer | Vladislav Vaintroub | 2017-06-19 | 1 | -1/+1 |
* | | | MDEV-9566 MariaBackup packaging | Vladislav Vaintroub | 2017-04-27 | 1 | -1/+6 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-06 | 1 | -5/+41 |
|\ \ \ | |/ / | |||||
| * | | Compiling, Windows . Avoid unnecessary rebuilds with MSVC. | Vladislav Vaintroub | 2017-04-03 | 1 | -5/+41 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-03-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-03-21 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Windows : Fix packaging when building with VS2017 | Vladislav Vaintroub | 2017-03-13 | 1 | -1/+1 |
* | | | Correct FSF address | iangilfillan | 2017-03-10 | 2 | -3/+3 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 3 | -5/+28 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 3 | -5/+28 |
| |\ \ | | |/ | |||||
| | * | MDEV-11214 Windows : MSI installation fails, if run by a service user (e.g L... | Vladislav Vaintroub | 2016-11-03 | 1 | -1/+16 |
| | * | MDEV-11157 Windows - Upgrade installer to use HeidiSQL 9.4 | Vladislav Vaintroub | 2016-10-27 | 2 | -4/+12 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 2 | -4/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 2 | -4/+8 |
| |\ \ | | |/ | |||||
| | * | Windows packaging : use /d switch to sign MSI, to prevent installer showing r... | Vladislav Vaintroub | 2016-08-19 | 1 | -0/+1 |
| | * | Windows : fix search for WiX root directory when using 64bit cmake | Vladislav Vaintroub | 2016-08-11 | 1 | -4/+7 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 3 | -4/+9 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 2 | -13/+7 |
| |\ \ | | |/ | |||||
| | * | MDEV-10117 - update HeidiSQL to current version | Vladislav Vaintroub | 2016-05-24 | 1 | -1/+1 |
| | * | MDEV-10071 Block installation on XP/Windows 2003 Server(they are no more supp... | Vladislav Vaintroub | 2016-05-24 | 1 | -0/+3 |
| | * | MDEV-10108 Fix errors in installations by domain user | Vladislav Vaintroub | 2016-05-24 | 1 | -1/+3 |
| | * | MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later) | Vladislav Vaintroub | 2016-04-27 | 1 | -11/+0 |
| * | | MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ins... | Vladislav Vaintroub | 2016-05-24 | 1 | -2/+2 |
* | | | MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later) | Vladislav Vaintroub | 2016-04-27 | 1 | -11/+0 |
* | | | MDEV-9659 : AWS KMS encryption plugin | Vladislav Vaintroub | 2016-03-13 | 1 | -2/+2 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -3/+0 |
| |\ \ | | |/ | |||||
| | * | MDEV-9024 Build fails with VS2015 | Sergei Golubchik | 2016-02-06 | 2 | -57/+45 |
* | | | MDEV 4691- address review comments | Vladislav Vaintroub | 2016-01-19 | 1 | -13/+8 |
* | | | Merge branch 'connect/10.1' into 10.1 | Sergei Golubchik | 2015-11-19 | 2 | -5/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Commit resolved conflicts | Olivier Bertrand | 2015-09-18 | 3 | -2/+6 |
| |\ \ | |||||
| | * \ | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 2 | -1/+6 |
| | |\ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -1/+0 |
| | |\ \ \ | |||||
| * | \ \ \ | Commit win and CONNECT resolved files | Olivier Bertrand | 2015-06-05 | 2 | -7/+33 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix win/ files to be stored with LF in repository | Vicentiu Ciorbaru | 2015-05-08 | 16 | -1896/+1896 |
| | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 2 | -2/+28 |
| | |\ \ \ \ | |||||
| * | | | | | | commit win/ changes | Olivier Bertrand | 2015-06-05 | 16 | -1870/+1870 |
| |/ / / / / | |||||
| * | | | | | fix for cmake builds on windows | Sergei Golubchik | 2015-02-10 | 1 | -2/+2 |
* | | | | | | MDEV-9024 Build fails with VS2015 | Vladislav Vaintroub | 2015-11-06 | 2 | -58/+44 |
* | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | fixes for buildbot:mariadb-5.5.46 | Sergei Golubchik | 2015-10-09 | 1 | -0/+2 |
* | | | | | MDEV-8296 MSVS 2013 & WiX 3.9 | Sergei Golubchik | 2015-08-01 | 2 | -1/+6 |
| |_|_|/ |/| | | |