database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-12-09 15:09:41 +01:00
parent 9a62120089 e5e5877740
commit a15234bf4b
251 changed files with 2265 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysql_upgrade_service.cc
View File

@ -134,7 +134,7 @@ static void die(const char *fmt, ...)
}
/*
Stop service that we started, if it was not initally running at
Stop service that we started, if it was not initially running at
program start.
*/
if (initial_service_state != UINT_MAX && initial_service_state != SERVICE_RUNNING)