diff options
author | unknown <monty@mysql.com> | 2004-03-25 22:05:09 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-25 22:05:09 +0200 |
commit | 7f0a632c1965aeab06976aff650cb545e7192cb4 (patch) | |
tree | 84d7297d8f71762a061e90217363681f271907fd /sql/nt_servc.cc | |
parent | 5a685dc81f0d83e303a6deb18903510b08bc9443 (diff) | |
parent | 143e585a7f5deed19e618cfa7e2987d0949d7ad7 (diff) | |
download | mariadb-git-7f0a632c1965aeab06976aff650cb545e7192cb4.tar.gz |
merge with 3.23
BitKeeper/etc/logging_ok:
auto-union
scripts/mysqlbug.sh:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/t/alter_table.test:
Merge code with 3.23
sql/nt_servc.cc:
use original code
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 8a3757a9768..8ae3aeff2a6 100644 --- a/sql/nt_servc.cc +++ b/sql/nt_servc.cc @@ -498,7 +498,7 @@ BOOL NTService::IsService(LPCSTR ServiceName) if ((scm= OpenSCManager(0, 0,SC_MANAGER_ENUMERATE_SERVICE))) { - if ((service = OpenService(scm,ServiceName, SERVICE_QUERY_STATUS ))) + if ((service = OpenService(scm,ServiceName, SERVICE_QUERY_STATUS))) { ret_value=TRUE; CloseServiceHandle(service); |