Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-6891: Update company name | Nirbhay Choubey | 2014-12-12 | 1 | -1/+1 |
| | |||||
* | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -2/+2 |
|\ | |||||
| * | MDEV-6271 update MSI installer to include latest Version of HeidiSQL (8.3.x.x) | Sergei Golubchik | 2014-05-27 | 1 | -2/+2 |
| | | |||||
* | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 3 | -7/+12 |
|\ \ | |/ | | | | | (without InnoDB - all InnoDB changes were ignored) | ||||
| * | remove start menu shortcut to upgrade wizard | Vladislav Vaintroub | 2013-05-19 | 1 | -0/+2 |
| | | |||||
| * | MDEV-4544 : Update MSI installer to use latest HeidiSQL 8.0 | Vladislav Vaintroub | 2013-05-19 | 1 | -1/+1 |
| | | |||||
| * | Small mysql_install_db.exe fixes | Vladislav Vaintroub | 2013-05-09 | 1 | -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 Vaintroub | 2013-04-30 | 2 | -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 Vaintroub | 2013-04-19 | 2 | -22/+26 |
| | | | | | | | | | | | | | | MSI package. Rename connect_engine component back to connect-engine. | ||||
* | | Fix MSI package creation for connect engine. | Vladislav Vaintroub | 2013-04-17 | 1 | -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 merge | Sergei Golubchik | 2013-01-31 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+1 |
| |\ | |||||
| | * | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+1 |
| | |\ | |||||
| | | * | merge | Vladislav Vaintroub | 2012-12-21 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | Support VS2012. Exclude compiler-defined symbols from being exported by ↵ | Vladislav Vaintroub | 2012-12-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | mysqld.exe | ||||
* | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -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=utf8 | Vladislav Vaintroub | 2013-01-01 | 1 | -0/+20 |
| | | | | | |||||
* | | | | | Trigger pusbuild build | Vladislav Vaintroub | 2012-11-11 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | 5.3 merge | Sergei Golubchik | 2012-08-27 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge from 5.2. | unknown | 2012-08-24 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-484 : allow compilation/packaging on Windows with newly released VS2012 | Vladislav Vaintroub | 2012-08-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | MSI package: always install new component "Common" (currently consists of ↵ | Vladislav Vaintroub | 2012-05-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | charset directory) | ||||
* | | | | merge | Sergei Golubchik | 2012-05-05 | 2 | -2/+15 |
|\ \ \ \ | |||||
| * \ \ \ | 5.3 merge | Sergei Golubchik | 2012-05-04 | 2 | -2/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge | Vladislav Vaintroub | 2012-05-02 | 2 | -2/+15 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV233 - Support Wix3.6 for MSI | Vladislav Vaintroub | 2012-04-25 | 2 | -2/+15 |
| | | | | | |||||
* | | | | | support same version upgrade for MSI | Vladislav Vaintroub | 2012-05-04 | 2 | -4/+7 |
|/ / / / | |||||
* | | | | merge | Vladislav Vaintroub | 2012-04-17 | 2 | -3/+89 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge | Vladislav Vaintroub | 2012-04-16 | 1 | -6/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | fix compiler warnings | Vladislav Vaintroub | 2012-04-16 | 1 | -6/+7 |
| | | | | |||||
| * | | | merge | Vladislav Vaintroub | 2012-04-16 | 2 | -3/+88 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-221 - Properly escape command line when starting mysql_install_db | Vladislav Vaintroub | 2012-04-16 | 2 | -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 UI | Vladislav Vaintroub | 2012-04-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 2 | -3/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 5.2->5.3 | unknown | 2012-03-14 | 2 | -3/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | LP947631: Uninstall wipes HeidiSQL settings, even if HeidiSQL is installed ↵ | Vladislav Vaintroub | 2012-03-06 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prior to MariaDB Fixed detection of installed HeidiSQL in the machine, prevent installing own copy if HeidiSQL is already installed. On deinstallation, do not remove settings if official HeidiSQL is detected. | ||||
* | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge | Vladislav Vaintroub | 2012-02-12 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Use newly released HeidiSQL 7.0 in the MSI installer | Vladislav Vaintroub | 2012-02-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-50 : Fix default compilation comment | Vladislav Vaintroub | 2012-01-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 3 | -3/+5 |
| |\ \ \ | | |/ / | | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit | ||||
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 3 | -3/+5 |
| | |\ \ | | | |/ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 5 | -5/+7 |
| | | |\ | | | | | | | | | | | | | | | | Fixed up copyright messages. | ||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -0/+36 |
| | | | |\ | |||||
* | | | | | | MDEV-33 : removed unused files in win/ | Vladislav Vaintroub | 2012-01-10 | 6 | -246/+0 |
| | | | | | | |||||
* | | | | | | Fix build and packaging on Windows: | Vladislav Vaintroub | 2011-11-26 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI - add some missing headers to windows specific source files. This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h no more includes whiole Windows - do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they are not needed. Do not build resolveip on Windows, it is not used. - precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests to speed up cmake run with VS) - make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin), fix null pointer access in PSI_register | ||||
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 3 | -3/+63 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge | Vladislav Vaintroub | 2011-10-12 | 1 | -2/+60 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Add option to enable feedback plugin to the MSI installer. | Vladislav Vaintroub | 2011-10-12 | 1 | -2/+60 |
| | | | | | |