mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-5.0-7856

Browse source 
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2005-02-07 12:19:32 -08:00
commit 9c99d6b267
1 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
sql/mysqld.cc
View file

@ -3376,39 +3376,34 @@ int main(int argc, char **argv)
return 0; return 0;
} }
} }
else if (argc >= 4) else if (argc == 4 || argc == 5)
{ {
const char *defaults_file = "--defaults-file"; /*
const char *service = "--local-service"; This may seem strange, because we handle --local-service while
char extra_opt[FN_REFLEN] = ""; preserving 4.1's behavior of allowing any one other argument that is
passed to the service on startup. (The assumption is that this is
--defaults-file=file, but that was not enforced in 4.1, so we don't
enforce it here.)
*/
char *extra_opt= NULL;
char *account_name = NULL; char *account_name = NULL;
char *option;
int index; int index;
for (index = 3; index < argc; index++) for (index = 3; index < argc; index++)
{ {
option= argv[index]; if (strncmp(argv[index], "--local-service", 15) == 0)
/*
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); account_name=(char*)malloc(27);
strmov(account_name, "NT AUTHORITY\\LocalService\0"); strmov(account_name, "NT AUTHORITY\\LocalService\0");
} }
else
{
extra_opt= argv[index];
}
} }
if (!default_service_handling(argv, argv[2], argv[2], file_path, extra_opt, account_name)) if (argc != 5 || account_name)
return 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)) else if (argc == 1 && Service.IsService(MYSQL_SERVICENAME))
{ {