database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-05-26 20:35:27 +03:00
parent eedca52b23 873033932a
commit 553637cbc4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -2566,9 +2566,12 @@ int main(int argc, char **argv)
return 0; return 0;
if (Service.IsService(argv[2])) if (Service.IsService(argv[2]))
{ {
/* start an optional service */ /*
mysqld was started as
mysqld --defaults-file=my_path\my.ini service-name
*/
use_opt_args=1; use_opt_args=1;
opt_argc=argc; opt_argc= 2; // Skip service-name
opt_argv=argv; opt_argv=argv;
start_mode= 1; start_mode= 1;
Service.Init(argv[2], mysql_service); Service.Init(argv[2], mysql_service);