Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.3' into 10.4 | Vladislav Vaintroub | 2020-06-05 | 1 | -1/+6 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into 10.3 | Vladislav Vaintroub | 2020-06-05 | 1 | -1/+6 |
| |\ | |||||
| | * | Fix appveyor build. | Vladislav Vaintroub | 2020-06-05 | 1 | -1/+6 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-06-05 | 1 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-06-05 | 1 | -1/+8 |
| |\ \ | | |/ | |||||
| | * | Windows, build tweak. | Vladislav Vaintroub | 2020-06-05 | 1 | -1/+8 |
| | * | fix warning | Vladislav Vaintroub | 2020-06-01 | 1 | -1/+1 |
* | | | Merge branch '10.3' into 10.4 | Vladislav Vaintroub | 2020-06-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | fix warning | Vladislav Vaintroub | 2020-06-01 | 1 | -1/+1 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-05-30 | 4 | -205/+79 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-05-29 | 4 | -205/+79 |
| |\ \ | | |/ | |||||
| | * | MDEV-22743 Windows 10 MSI installer : port in use is not determined | Vladislav Vaintroub | 2020-05-29 | 1 | -21/+76 |
| | * | MSI installer : Use CAQuietExec64 on Win64 , not CAQuietExec | Vladislav Vaintroub | 2020-05-29 | 2 | -1/+3 |
| | * | Remove unused WiX source file | Vladislav Vaintroub | 2020-05-29 | 1 | -183/+0 |
* | | | MDEV-22555 Windows, packaging: binaries depend on vcruntime140_1.dll, which ... | Vladislav Vaintroub | 2020-05-14 | 1 | -4/+8 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-04-16 | 2 | -10/+20 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-04-15 | 2 | -10/+20 |
| |\ \ | | |/ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2020-04-14 | 2 | -10/+20 |
| | |\ | |||||
| | | * | Merge 5.5 into 10.1bb-10.1-merge | Marko Mäkelä | 2020-04-01 | 2 | -10/+20 |
| | | |\ | |||||
| | | | * | MDEV-22032 update HeidiSQL to version 11 | Vladislav Vaintroub | 2020-03-24 | 2 | -10/+20 |
* | | | | | MDEV-19781 fixups | Vladislav Vaintroub | 2019-11-27 | 7 | -272/+258 |
* | | | | | MDEV-19781 Create MariaDB named commands on Windowsbb-10.4-MDEV-19781 | Rasmus Johansson | 2019-11-26 | 5 | -105/+437 |
* | | | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-07-28 | 2 | -10/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix Windows packaging. | Vladislav Vaintroub | 2019-07-27 | 1 | -2/+2 |
| * | | | | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2019-07-26 | 2 | -12/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2019-07-26 | 2 | -16/+13 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.1 | Oleksandr Byelkin | 2019-07-25 | 2 | -16/+13 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-19922 Old version of heidisql in mariadb installer | Vladislav Vaintroub | 2019-07-05 | 2 | -16/+13 |
* | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-07-02 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-19889 In CMakeLists.txt, use ${CMAKE_CPACK_COMMAND},rather than just cpack | Vladislav Vaintroub | 2019-06-27 | 1 | -2/+2 |
* | | | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 5 | -6/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 5 | -6/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 5 | -6/+6 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 3 | -3/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 3 | -3/+3 |
| | | * | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 2 | -3/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | | | * | Update FSF address | Michal Schorm | 2019-05-10 | 2 | -3/+3 |
* | | | | | MDEV-19354 : Change default service name in MSI UI to MariaDB. | Vladislav Vaintroub | 2019-04-29 | 2 | -2/+2 |
* | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-03-06 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-05 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-03-04 | 1 | -2/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2019-03-01 | 1 | -2/+3 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-02-28 | 1 | -2/+3 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | MDEV-18506 MSI can't be built if MFC package is not installed with Visual Studio | Vladislav Vaintroub | 2019-02-07 | 1 | -2/+3 |
* | | | | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-02-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | dirty merge | Oleksandr Byelkin | 2019-02-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-03 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 10.1 into 10.1 | Marko Mäkelä | 2019-02-02 | 1 | -1/+1 |
| | | |\ \ \ | | | | |/ / |