A follow-up on WL#5154 and WL#5182: remove forgotten options.

3 files changed, 15 insertions, 49 deletions

diff --git a/netware/my_manage.c b/netware/my_manage.c
index d5032da2208..5f59e46374f 100644
--- a/netware/my_manage.c
+++ b/netware/my_manage.c
@@ -201,8 +201,7 @@ int wait_for_server_start(char *bin_dir, char *user, char *password, int port,ch
   add_arg(&al, "--silent");
 
 #ifdef NOT_USED
-  add_arg(&al, "-O");
-  add_arg(&al, "connect_timeout=10");
+  add_arg(&al, "--connect_timeout=10");
   add_arg(&al, "-w");
 #endif
 
@@ -301,8 +300,7 @@ int stop_server(char *bin_dir, char *user, char *password, int port,
 	add_arg(&al, "--port=%u", port);
 	add_arg(&al, "--user=%s", user);
 	add_arg(&al, "--password=%s", password);
-	add_arg(&al, "-O");
-	add_arg(&al, "shutdown_timeout=20");
+	add_arg(&al, "--shutdown_timeout=20");
 	add_arg(&al, "shutdown");
 
 	// spawn
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index 010c4380fdd..5fa92b325b6 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -348,7 +348,7 @@ void start_master()
   add_arg(&al, "--character-sets-dir=%s", char_dir);
   add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
   add_arg(&al, "--language=%s", lang_dir);
-  add_arg(&al, "--log-bin-trust-routine-creators");
+  add_arg(&al, "--log-bin-trust-function-creators");
   add_arg(&al, "--log-slow-queries");
   add_arg(&al, "--log-queries-not-using-indexes");
 #ifdef DEBUG	//only for debug builds
@@ -367,12 +367,9 @@ void start_master()
   add_arg(&al, "--init-rpl-role=master");
 
   // $SMALL_SERVER
-  add_arg(&al, "-O");
-  add_arg(&al, "key_buffer_size=1M");
-  add_arg(&al, "-O");
-  add_arg(&al, "sort_buffer=256K");
-  add_arg(&al, "-O");
-  add_arg(&al, "max_heap_table_size=1M");
+  add_arg(&al, "--key_buffer_size=1M");
+  add_arg(&al, "--sort_buffer=256K");
+  add_arg(&al, "--max_heap_table_size=1M");
 
   // $EXTRA_MASTER_OPT
   if (master_opt[0] != NULL)
@@ -522,9 +519,8 @@ void start_slave()
   add_arg(&al, "--report-port=%u", slave_port);
 
   add_arg(&al, "--master-retry-count=10");
-  add_arg(&al, "-O");
-  add_arg(&al, "slave_net_timeout=10");
-  add_arg(&al, "--log-bin-trust-routine-creators");
+  add_arg(&al, "--slave_net_timeout=10");
+  add_arg(&al, "--log-bin-trust-function-creators");
   add_arg(&al, "--log-slow-queries");
   add_arg(&al, "--log-queries-not-using-indexes");
 #ifdef DEBUG	//only for debug builds
@@ -564,12 +560,9 @@ void start_slave()
   }
   
   // small server
-  add_arg(&al, "-O");
-  add_arg(&al, "key_buffer_size=1M");
-  add_arg(&al, "-O");
-  add_arg(&al, "sort_buffer=256K");
-  add_arg(&al, "-O");
-  add_arg(&al, "max_heap_table_size=1M");
+  add_arg(&al, "--key_buffer_size=1M");
+  add_arg(&al, "--sort_buffer=256K");
+  add_arg(&al, "--max_heap_table_size=1M");
 
   // opt args
   if (slave_opt[0] != NULL)
diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c
index 6ed04c9ff0d..2a4268d63ef 100644
--- a/netware/mysqld_safe.c
+++ b/netware/mysqld_safe.c
@@ -68,7 +68,6 @@ void check_data_vol();
 void check_setup();

 void check_tables();

 void mysql_start(int, char *[]);
-void parse_setvar(char *arg);
 

 /******************************************************************************

 

@@ -330,8 +329,7 @@ void parse_args(int argc, char *argv[])
     OPT_ERR_LOG,

     OPT_SAFE_LOG,

     OPT_MYSQLD,
-    OPT_HELP,
-    OPT_SETVAR
+    OPT_HELP
   };

 
   static struct option options[]=
@@ -347,7 +345,6 @@ void parse_args(int argc, char *argv[])
     {"safe-log", required_argument, 0, OPT_SAFE_LOG},
     {"mysqld", required_argument, 0, OPT_MYSQLD},
     {"help", no_argument, 0, OPT_HELP},
-    {"set-variable", required_argument, 0, OPT_SETVAR},
     {0, 0, 0, 0}
   };

 
@@ -395,10 +392,6 @@ void parse_args(int argc, char *argv[])
       strcpy(mysqld, optarg);

       break;

 
-    case OPT_SETVAR:
-      parse_setvar(optarg);
-      break;
-
     case OPT_HELP:
       usage();
       break;
@@ -410,21 +403,6 @@ void parse_args(int argc, char *argv[])
   }

 }

 

-/*
-  parse_setvar(char *arg)
-  Pasrsing for port just to display the port num on the mysqld_safe screen
-*/
-void parse_setvar(char *arg)
-{
-  char *pos;
-
-  if ((pos= strindex(arg, "port")))
-  {
-    for (; *pos && *pos != '='; pos++);
-    if (*pos)
-      strcpy(port, pos + 1);
-  }
-}
 
 /******************************************************************************
 
@@ -589,10 +567,8 @@ void check_tables()
 	  add_arg(&al, "--force");
 	  add_arg(&al, "--fast");
 	  add_arg(&al, "--medium-check");
-	  add_arg(&al, "-O");
-	  add_arg(&al, "key_buffer=64M");
-	  add_arg(&al, "-O");
-	  add_arg(&al, "sort_buffer=64M");
+	  add_arg(&al, "--key_buffer=64M");
+	  add_arg(&al, "--sort_buffer=64M");
 	  add_arg(&al, table);
 

 	  spawn(mycheck, &al, TRUE, NULL, NULL, NULL);
@@ -611,8 +587,7 @@ void check_tables()
 	  add_arg(&al, mycheck);
 	  add_arg(&al, "--silent");
 	  add_arg(&al, "--force");
-	  add_arg(&al, "-O");
-	  add_arg(&al, "sort_buffer=64M");
+	  add_arg(&al, "--sort_buffer=64M");
 	  add_arg(&al, table);
 
 	  spawn(mycheck, &al, TRUE, NULL, NULL, NULL);