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

fix embedded startup with no command line arguments

Browse Source 
&fake_argv cannot be cast to char***
this causes a crash when resolving
This commit is contained in:
Sergei Golubchik
2022-11-24 21:51:19 +01:00
parent cfb47ddde2
commit c7c1461b94
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libmysqld/lib_sql.cc
View File

@ -518,7 +518,6 @@ int init_embedded_server(int argc, char **argv, char **groups)
*/ */
int *argcp; int *argcp;
char ***argvp; char ***argvp;
int fake_argc = 1;
char *fake_argv[] = { (char *)"", 0 }; char *fake_argv[] = { (char *)"", 0 };
const char *fake_groups[] = { "server", "embedded", 0 }; const char *fake_groups[] = { "server", "embedded", 0 };
my_bool acl_error; my_bool acl_error;
@ -531,16 +530,14 @@ int init_embedded_server(int argc, char **argv, char **groups)
if (init_early_variables()) if (init_early_variables())
return 1; return 1;
if (argc) if (!argc)
{ {
argcp= &argc; argc= 1;
argvp= (char***) &argv; argv= fake_argv;
}
else
{
argcp= &fake_argc;
argvp= (char ***) &fake_argv;
} }
argcp= &argc;
argvp= &argv;
if (!groups) if (!groups)
groups= (char**) fake_groups; groups= (char**) fake_groups;