diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /sql/mysql_upgrade_service.cc | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mysql_upgrade_service.cc')
| -rw-r--r-- | sql/mysql_upgrade_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc index dc4b2d0923c..60fd8fc7efa 100644 --- a/sql/mysql_upgrade_service.cc +++ b/sql/mysql_upgrade_service.cc @@ -132,7 +132,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) |