summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-10-30 01:20:38 +0200
committerunknown <monty@narttu.mysql.fi>2003-10-30 01:20:38 +0200
commitcee3ddb401579ff062ac349103fcfcb33cb247e9 (patch)
tree97f73a756b616505169456879bbf8f78e8a50c70 /sql/mysqld.cc
parent7da08881a34b9c04dda6c0559742f360a5306224 (diff)
downloadmariadb-git-cee3ddb401579ff062ac349103fcfcb33cb247e9.tar.gz
Safety fix for adding service name to search config groups
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index cdcf13ca7bf..e5ddbfe7a33 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2644,7 +2644,8 @@ int main(int argc, char **argv)
opt_argc= 2; // Skip service-name
opt_argv=argv;
start_mode= 1;
- load_default_groups[3]= argv[2];
+ if (my_strcasecmp(argv[2],"mysql"))
+ load_default_groups[3]= argv[2];
Service.Init(argv[2], mysql_service);
return 0;
}