Merge 10.8 into 10.9

1 files changed, 6 insertions, 9 deletions

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 8cf4f6d4cf8..5a8945a35a6 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -526,7 +526,6 @@ int init_embedded_server(int argc, char **argv, char **groups)
    */
   int *argcp;
   char ***argvp;
-  int fake_argc = 1;
   char *fake_argv[] = { (char *)"", 0 };
   const char *fake_groups[] = { "server", "embedded", 0 };
   my_bool acl_error;
@@ -539,16 +538,14 @@ int init_embedded_server(int argc, char **argv, char **groups)
   if (init_early_variables())
     return 1;
 
-  if (argc)
+  if (!argc)
   {
-    argcp= &argc;
-    argvp= (char***) &argv;
-  }
-  else
-  {
-    argcp= &fake_argc;
-    argvp= (char ***) &fake_argv;
+    argc= 1;
+    argv= fake_argv;
   }
+  argcp= &argc;
+  argvp= &argv;
+
   if (!groups)
     groups= (char**) fake_groups;