| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Update FSF address | Michal Schorm | 2019-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \; | ||||
| * | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-29 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | MDEV-19054 : mysql_upgrade_service now allows MySQL 5.7 to MariaDB 10.2 ↵ | Vladislav Vaintroub | 2019-03-28 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | upgrade. | ||||
| * | | | Simple cleanups | Monty | 2017-11-05 | 1 | -5/+6 |
| |/ / | | | | | | | - Add 'stage name' to debug output | ||||
| * | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
| | | | |||||
| * | | MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ↵ | Vladislav Vaintroub | 2016-05-24 | 1 | -3/+10 |
| |/ | | | | installer. Do not lauch upgrade wizard after installation | ||||
| * | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -1/+38 |
| |\ | |||||
| | * | LP952607: Do not show MySQL services preinstalled by Dell in the upgrade wizard | Vladislav Vaintroub | 2012-03-12 | 1 | -1/+38 |
| | | | |||||
| * | | fix the include guards and add missing gplv2 headers | Sergei Golubchik | 2012-02-17 | 1 | -0/+16 |
| | | | |||||
| * | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | lp:893522 more problems found by PVS Studio | Sergei Golubchik | 2012-01-12 | 1 | -2/+2 |
| | | | |||||
| * | | Fix build and packaging on Windows: | Vladislav Vaintroub | 2011-11-26 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | MWL#55 : Philip's review: | Vladislav Vaintroub | 2011-02-15 | 1 | -6/+19 |
| | | | | | | | | Take into account that mysql services start even with invalid defaults files (using data file relative to mysqld.exe location). Handle this case in upgrade scenarios, as if there was no --defaults-file in service definition. | ||||
| * | MWL#55: look for my.cnf in addition to my.ini trying to figure out defaults ↵ | Vladislav Vaintroub | 2011-02-08 | 1 | -2/+6 |
| | | | | | file for the service | ||||
| * | MWL#55: Handle cases where service was installed with | Vladislav Vaintroub | 2011-02-04 | 1 | -12/+75 |
| | | | | | | | | | | | | mysqld --install without any parameters. In such case, service name is always MYSQL, as service binary path is "path\to\mysqld.exe" "MySQL". Guess data directory it is either from my.ini (which is assumed to be in the installation root), or just data directory under install root. | ||||
| * | MWL#55: correct mysqld.exe file path, to extract version from it. | Vladislav Vaintroub | 2011-02-03 | 1 | -1/+1 |
| | | | | | | Take into account that services registered by MySQL do not have .exe extension in service binary path. | ||||
| * | split long lines, use get_mysql_service_properties() | Vladislav Vaintroub | 2011-01-30 | 1 | -0/+167 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |