diff options
author | unknown <monty@mysql.com> | 2004-03-25 21:52:25 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-25 21:52:25 +0200 |
commit | 143e585a7f5deed19e618cfa7e2987d0949d7ad7 (patch) | |
tree | ca06bdf091cbc917e5ba5da62c13909c2aabdfb8 | |
parent | 8711aa163511d5f81541bc9073f4921fa5ddd834 (diff) | |
download | mariadb-git-143e585a7f5deed19e618cfa7e2987d0949d7ad7.tar.gz |
Improved test case
service backport from 4.0
mysql-test/t/alter_table.test:
Improved test case
sql/nt_servc.cc:
service backport from 4.0
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
-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); |