diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
| commit | adc91387e3add6d9c850b7c2a44760deaceb3638 (patch) | |
| tree | c772c6339d2f715a1a50766e30790307e0658f3e /sql/nt_servc.cc | |
| parent | bc28b305e538774eae4152b300cd323e9a724393 (diff) | |
| parent | 29c776cfd1e560846e394f39d79ae43ff7d70c61 (diff) | |
| download | mariadb-git-adc91387e3add6d9c850b7c2a44760deaceb3638.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/nt_servc.cc')
| -rw-r--r-- | sql/nt_servc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc index d6a8eac7ed5..e05e43a0a59 100644 --- a/sql/nt_servc.cc +++ b/sql/nt_servc.cc @@ -508,7 +508,7 @@ BOOL NTService::IsService(LPCSTR ServiceName) } /* ------------------------------------------------------------------------ -------------------------------------------------------------------------- */ -BOOL NTService::got_service_option(char **argv, char *service_option) +BOOL NTService::got_service_option(char **argv, const char *service_option) { char *option; for (option= argv[1]; *option; option++) |