summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)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 ↵Vladislav Vaintroub2016-05-241-0/+3
| | | | | | | | | | | | supported)
| | * 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
| | | | | | | | | | | | | | | This appears to break some installation, and it did not do anything useful anyway.
| * | MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ↵Vladislav Vaintroub2016-05-241-2/+2
| | | | | | | | | | | | installer. Do not lauch upgrade wizard after installation
* | | MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
| | | | | | | | | | | | | | | This appears to break some installation, and it did not do anything useful anyway.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick f1daf9ce from 10.0 branch ------------------------------------- Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera
| | * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, the files get checked out with CRLF thanks to .gitattributes.
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | fixes for buildbot:mariadb-5.5.46Sergei Golubchik2015-10-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * OSX (mysqlimport freeing unallocated memory) * Windows (didn't compile MSI) * fulltest2 (innodb crashes in --embedded --big)
* | | | | MDEV-8296 MSVS 2013 & WiX 3.9Sergei Golubchik2015-08-012-1/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Support for VS2013 and WiX 3.9 (patch by Andrey Kuznetsov)
* | | | 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
| |_|/ |/| |
* | | 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 ↵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().
View Lorry Controller Status