diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | mysql-test/t/alter_table.test | 2 | ||||
| -rw-r--r-- | sql/nt_servc.cc | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 359cad878c2..e0a0f4304fb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -25,6 +25,7 @@ monty@donna.mysql.fi monty@hundin.mysql.fi monty@mashka.mysql.fi monty@mishka.mysql.fi +monty@mysql.com monty@narttu. monty@narttu.mysql.fi monty@tik. diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index ec057c156c8..160495bcba6 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -117,4 +117,6 @@ connection user1; -- error 1142 alter table t1 rename t2; connection root; +revoke all privileges on mysqltest.t1 from mysqltest_1@localhost; +delete from mysql.user where user='mysqltest_1'; drop database mysqltest; diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc index b18d3d00d88..320098cd8bc 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_ALL_ACCESS ))) + if ((service = OpenService(scm,ServiceName, SERVICE_QUERY_STATUS))) { ret_value=TRUE; CloseServiceHandle(service); |