mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/wax/mysql/mysql-5.0

Browse source 
into mysql.com:/home/wax/mysql/mysql-5.0service
This commit is contained in:
wax@mysql.com 2004-05-16 02:44:52 +06:00
commit a18689892a
1 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sql/mysqld.cc
View file

@ -2852,7 +2852,8 @@ default_service_handling(char **argv,
const char *servicename,
const char *displayname,
const char *file_path,
const char *extra_opt)
const char *extra_opt,
const char *account_name)
{
char path_and_service[FN_REFLEN+FN_REFLEN+32], *pos, *end;
end= path_and_service + sizeof(path_and_service)-3;
@ -2871,12 +2872,12 @@ default_service_handling(char **argv,
if (Service.got_service_option(argv, "install"))
{
Service.Install(1, servicename, displayname, path_and_service);
Service.Install(1, servicename, displayname, path_and_service, account_name);
return 0;
}
if (Service.got_service_option(argv, "install-manual"))
{
Service.Install(0, servicename, displayname, path_and_service);
Service.Install(0, servicename, displayname, path_and_service, account_name);
return 0;
}
if (Service.got_service_option(argv, "remove"))
@ -2911,7 +2912,7 @@ int main(int argc, char **argv)
if (argc == 2)
{
if (!default_service_handling(argv, MYSQL_SERVICENAME, MYSQL_SERVICENAME,
file_path, ""))
file_path, "", NULL))
return 0;
if (Service.IsService(argv[1])) /* Start an optional service */
{
@ -2930,7 +2931,7 @@ int main(int argc, char **argv)
}
else if (argc == 3) /* install or remove any optional service */
{
if (!default_service_handling(argv, argv[2], argv[2], file_path, ""))
if (!default_service_handling(argv, argv[2], argv[2], file_path, "", NULL))
return 0;
if (Service.IsService(argv[2]))
{
@ -2948,15 +2949,39 @@ int main(int argc, char **argv)
return 0;
}
}
else if (argc == 4)
else if (argc >= 4)
{
/*
Install an optional service with optional config file
mysqld --install-manual mysqldopt --defaults-file=c:\miguel\my.ini
*/
if (!default_service_handling(argv, argv[2], argv[2], file_path,
argv[3]))
return 0;
const char *defaults_file = "--defaults-file";
const char *service = "--local-service";
char extra_opt[FN_REFLEN] = "";
char *account_name = NULL;
char *option;
int index;
for (index = 3; index < argc; index++)
{
option= argv[index];
/*
Install an optional service with optional config file
mysqld --install-manual mysqldopt --defaults-file=c:\miguel\my.ini
*/
if (strncmp(option, defaults_file, strlen(defaults_file)) == 0)
{
strmov(extra_opt, option);
}
else
/*
Install an optional service as local service
mysqld --install-manual mysqldopt --local-service
*/
if (strncmp(option, service, strlen(service)) == 0)
{
account_name=(char*)malloc(27);
strmov(account_name, "NT AUTHORITY\\LocalService\0");
}
}
if (!default_service_handling(argv, argv[2], argv[2], file_path, extra_opt, account_name))
return 0;
}
else if (argc == 1 && Service.IsService(MYSQL_SERVICENAME))
{