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

46 files changed, 95 insertions, 288 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 4fbffc033e0..9cb1ecd3c21 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -457,7 +457,6 @@ static COMMANDS commands[] = {
   { "FORCE", 0, 0, 0, ""},
   { "FOREIGN", 0, 0, 0, ""},
   { "FOUND", 0, 0, 0, ""},
-  { "FRAC_SECOND", 0, 0, 0, ""},
   { "FROM", 0, 0, 0, ""},
   { "FULL", 0, 0, 0, ""},
   { "FULLTEXT", 0, 0, 0, ""},
@@ -702,7 +701,6 @@ static COMMANDS commands[] = {
   { "SQL_NO_CACHE", 0, 0, 0, ""},
   { "SQL_SMALL_RESULT", 0, 0, 0, ""},
   { "SQL_THREAD", 0, 0, 0, ""},
-  { "SQL_TSI_FRAC_SECOND", 0, 0, 0, ""},
   { "SQL_TSI_SECOND", 0, 0, 0, ""},
   { "SQL_TSI_MINUTE", 0, 0, 0, ""},
   { "SQL_TSI_HOUR", 0, 0, 0, ""},
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 22efb54f915..b021c0f155e 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -174,9 +174,6 @@ static struct my_option my_long_options[] =
    "Show difference between current and previous values when used with -i. Currently only works with extended-status.",
    (uchar**) &opt_relative, (uchar**) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
-  {"set-variable", 'O',
-   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name,
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm
index 40f05c41d1c..3bfbe1fc90e 100644
--- a/mysql-test/lib/My/Options.pm
+++ b/mysql-test/lib/My/Options.pm
@@ -67,9 +67,6 @@ sub _split_option {
   elsif ($option=~ /^(.*)=(.*)$/){
     return ($1, $2)
   }
-  elsif ($option=~ /^-O$/){
-    return (undef, undef);
-  }
   die "Unknown option format '$option'";
 }
 
@@ -169,20 +166,11 @@ sub toSQL {
   my @sql;
 
   foreach my $option (@options) {
-    my ($name, $value)= _split_option($option);
-    #print "name: $name\n";
+    my ($sql_name, $value)= _split_option($option);
+    #print "name: $sql_name\n";
     #print "value: $value\n";
-    if ($name =~ /^O, (.*)/){
-      push(@sql, "SET GLOBAL $1=$value");
-    }
-    elsif ($name =~ /^set-variable=(.*)/){
-      push(@sql, "SET GLOBAL $1=$value");
-    }
-    else {
-      my $sql_name= $name;
-      $sql_name=~ s/-/_/g;
-      push(@sql, "SET GLOBAL $sql_name=$value");
-    }
+    $sql_name=~ s/-/_/g;
+    push(@sql, "SET GLOBAL $sql_name=$value");
   }
   return join("; ", @sql);
 }
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 7b7dd70a696..cb893402258 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -1150,7 +1150,7 @@ sub opts_from_file ($) {
   {
     chomp;
 
-    #    --set-variable=init_connect=set @a='a\\0c'
+    #    --init_connect=set @a='a\\0c'
     s/^\s+//;                           # Remove leading space
     s/\s+$//;                           # Remove ending space
 
diff --git a/mysql-test/lib/t/Options.t b/mysql-test/lib/t/Options.t
index 7012f3da8de..3824c838627 100644
--- a/mysql-test/lib/t/Options.t
+++ b/mysql-test/lib/t/Options.t
@@ -45,42 +45,30 @@ my @tests=
 
   [
    [ ],
-   ['-O', 'max_binlog_size=1' ],
    ['--max_binlog_size=1' ]
   ],
 
   [
-   ['-O', 'max_binlog_size=1' ],
-   ['-O', 'max_binlog_size=1' ],
-   [ ],
-  ],
-
-  [
-   ['-O', 'max_binlog_size=1' ],
    [ ],
    ['--max_binlog_size=default' ]
   ],
 
   [
    [ ],
-   ['-O', 'max_binlog_size=1', '--binlog-format=row' ],
    ['--max_binlog_size=1', '--binlog-format=row' ]
   ],
   [
    ['--binlog-format=statement' ],
-   ['-O', 'max_binlog_size=1', '--binlog-format=row' ],
    ['--max_binlog_size=1', '--binlog-format=row']
   ],
 
   [
    [ '--binlog-format=statement' ],
-   ['-O', 'max_binlog_size=1', '--binlog-format=statement' ],
    ['--max_binlog_size=1' ]
   ],
 
  [
    [ '--binlog-format=statement' ],
-   ['-O', 'max_binlog_size=1', '--binlog-format=statement' ],
    ['--max_binlog_size=1' ]
  ],
 
@@ -93,7 +81,7 @@ my @tests=
 
  [
   [ '--binlog-format=statement' ],
-  ['--relay-log=/path/to/a/relay-log', '-O', 'max_binlog_size=1'],
+  ['--relay-log=/path/to/a/relay-log', '--max_binlog_size=1'],
   ['--max_binlog_size=1', '--relay-log=/path/to/a/relay-log', '--binlog-format=default' ]
  ],
 
diff --git a/mysql-test/lib/v1/mtr_io.pl b/mysql-test/lib/v1/mtr_io.pl
index aa671c0f4f7..952b8f1f4ba 100644
--- a/mysql-test/lib/v1/mtr_io.pl
+++ b/mysql-test/lib/v1/mtr_io.pl
@@ -80,7 +80,7 @@ sub mtr_get_opts_from_file ($) {
   {
     chomp;
 
-    #    --set-variable=init_connect=set @a='a\\0c'
+    #    --init_connect=set @a='a\\0c'
     s/^\s+//;                           # Remove leading space
     s/\s+$//;                           # Remove ending space
 
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
index 5d9b0dbb221..f2c8252c47d 100755
--- a/mysql-test/lib/v1/mysql-test-run.pl
+++ b/mysql-test/lib/v1/mysql-test-run.pl
@@ -3997,7 +3997,7 @@ sub mysqld_arguments ($$$$) {
     my $slave_load_path= "../tmp";
     mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix,
                 $slave_load_path);
-    mtr_add_arg($args, "%s--set-variable=slave_net_timeout=120", $prefix);
+    mtr_add_arg($args, "%s--slave_net_timeout=120", $prefix);
 
     if ( @$slave_master_info )
     {
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index fd692c17efa..64f8aa63a30 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -484,8 +484,7 @@ The following options may be given as the first argument:
  the SUPER privilege
  --read-rnd-buffer-size=# 
  When reading rows in sorted order after a sort, the rows
- are read through this buffer to avoid a disk seeks. If
- not set, then it's set to the value of record_buffer
+ are read through this buffer to avoid a disk seeks
  --relay-log=name    The location and name to use for relay logs
  --relay-log-index=name 
  The location and name to use for the file that keeps a
@@ -715,9 +714,6 @@ The following options may be given as the first argument:
  Prohibit update of a VIEW, which does not contain a key
  of the underlying table and the query uses a LIMIT clause
  (usually get from GUI tools)
- -s, --use-symbolic-links 
- Enable symbolic link support. Deprecated option; use
- --symbolic-links instead.
  -u, --user=name     Run mysqld daemon as user.
  -v, --verbose       Used with --help option for detailed help.
  -V, --version       Output version information and exit.
@@ -941,7 +937,6 @@ transaction-alloc-block-size 8192
 transaction-isolation REPEATABLE-READ
 transaction-prealloc-size 4096
 updatable-views-with-limit YES
-use-symbolic-links FALSE
 verbose TRUE
 wait-timeout 28800
 
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index 00d3aa7502f..e51e0ed76b5 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -484,8 +484,7 @@ The following options may be given as the first argument:
  the SUPER privilege
  --read-rnd-buffer-size=# 
  When reading rows in sorted order after a sort, the rows
- are read through this buffer to avoid a disk seeks. If
- not set, then it's set to the value of record_buffer
+ are read through this buffer to avoid a disk seeks
  --relay-log=name    The location and name to use for relay logs
  --relay-log-index=name 
  The location and name to use for the file that keeps a
@@ -719,9 +718,6 @@ The following options may be given as the first argument:
  Prohibit update of a VIEW, which does not contain a key
  of the underlying table and the query uses a LIMIT clause
  (usually get from GUI tools)
- -s, --use-symbolic-links 
- Enable symbolic link support. Deprecated option; use
- --symbolic-links instead.
  -u, --user=name     Run mysqld daemon as user.
  -v, --verbose       Used with --help option for detailed help.
  -V, --version       Output version information and exit.
@@ -947,7 +943,6 @@ transaction-alloc-block-size 8192
 transaction-isolation REPEATABLE-READ
 transaction-prealloc-size 4096
 updatable-views-with-limit YES
-use-symbolic-links FALSE
 verbose TRUE
 wait-timeout 28800
 
diff --git a/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt b/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
index ad2c6a647b5..f8e46a44854 100644
--- a/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
@@ -1 +1 @@
--O max_binlog_size=4096
+--max_binlog_size=4096
diff --git a/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt b/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
index ad2c6a647b5..f8e46a44854 100644
--- a/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
@@ -1 +1 @@
--O max_binlog_size=4096
+--max_binlog_size=4096
diff --git a/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt b/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
index 95bca94fd3a..ad7fd508afe 100644
--- a/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
@@ -1 +1 @@
--O max_binlog_size=1M  --relay-log=$MYSQLTEST_VARDIR/mysqld.1/data/relay-log
+--max_binlog_size=1M  --relay-log=$MYSQLTEST_VARDIR/mysqld.1/data/relay-log
diff --git a/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt b/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
index e2aa63225a3..c8d2f85bcb7 100644
--- a/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
@@ -1 +1 @@
--O max_binlog_size=1M --relay-log=$MYSQLTEST_VARDIR/mysqld.2/data/relay-log
+--max_binlog_size=1M --relay-log=$MYSQLTEST_VARDIR/mysqld.2/data/relay-log
diff --git a/mysql-test/suite/rpl/t/rpl_packet-master.opt b/mysql-test/suite/rpl/t/rpl_packet-master.opt
index 42d4f94c999..412bc079caa 100644
--- a/mysql-test/suite/rpl/t/rpl_packet-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_packet-master.opt
@@ -1 +1 @@
--O max_allowed_packet=1024 -O net_buffer_length=1024
+--max_allowed_packet=1024 --net_buffer_length=1024
diff --git a/mysql-test/suite/rpl/t/rpl_packet-slave.opt b/mysql-test/suite/rpl/t/rpl_packet-slave.opt
index 42d4f94c999..412bc079caa 100644
--- a/mysql-test/suite/rpl/t/rpl_packet-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_packet-slave.opt
@@ -1 +1 @@
--O max_allowed_packet=1024 -O net_buffer_length=1024
+--max_allowed_packet=1024 --net_buffer_length=1024
diff --git a/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
index e5b24dd9413..5cdfe28dd79 100644
--- a/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
@@ -1,2 +1,2 @@
--O max_relay_log_size=16384
+--max_relay_log_size=16384
 --log-warnings
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
index cf4319f2b40..2211d2dbb2d 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
@@ -1,3 +1,3 @@
--O max_relay_log_size=16384
+--max_relay_log_size=16384
 --loose-innodb
 --log-warnings
diff --git a/mysql-test/t/cache_innodb-master.opt b/mysql-test/t/cache_innodb-master.opt
index 5f0ebff98f6..6672b4ddce1 100644
--- a/mysql-test/t/cache_innodb-master.opt
+++ b/mysql-test/t/cache_innodb-master.opt
@@ -1 +1 @@
---set-variable=query_cache_size=1M
+--query_cache_size=1M
diff --git a/mysql-test/t/count_distinct2-master.opt b/mysql-test/t/count_distinct2-master.opt
index d81cc55090d..2fa4c2b903d 100644
--- a/mysql-test/t/count_distinct2-master.opt
+++ b/mysql-test/t/count_distinct2-master.opt
@@ -1 +1 @@
---set-variable=max_heap_table_size=16384
+--max_heap_table_size=16384
diff --git a/mysql-test/t/init_connect-master.opt b/mysql-test/t/init_connect-master.opt
index 108a8687aa2..db17a49c058 100644
--- a/mysql-test/t/init_connect-master.opt
+++ b/mysql-test/t/init_connect-master.opt
@@ -1 +1 @@
---set-variable=init_connect="set @a='a\\0c'"
+--init_connect="set @a='a\\0c'"
diff --git a/mysql-test/t/multi_update-master.opt b/mysql-test/t/multi_update-master.opt
index 9f1a29461ff..da78f987af3 100644
--- a/mysql-test/t/multi_update-master.opt
+++ b/mysql-test/t/multi_update-master.opt
@@ -1 +1 @@
---set-variable=tmp_table_size=1024
+--tmp_table_size=1024
diff --git a/mysql-test/t/multi_update2-master.opt b/mysql-test/t/multi_update2-master.opt
index 9f1a29461ff..da78f987af3 100644
--- a/mysql-test/t/multi_update2-master.opt
+++ b/mysql-test/t/multi_update2-master.opt
@@ -1 +1 @@
---set-variable=tmp_table_size=1024
+--tmp_table_size=1024
diff --git a/mysql-test/t/multi_update_tiny_hash-master.opt b/mysql-test/t/multi_update_tiny_hash-master.opt
index d81cc55090d..2fa4c2b903d 100644
--- a/mysql-test/t/multi_update_tiny_hash-master.opt
+++ b/mysql-test/t/multi_update_tiny_hash-master.opt
@@ -1 +1 @@
---set-variable=max_heap_table_size=16384
+--max_heap_table_size=16384
diff --git a/mysql-test/t/order_fill_sortbuf-master.opt b/mysql-test/t/order_fill_sortbuf-master.opt
index 9aa3cc76221..7b6ade99226 100644
--- a/mysql-test/t/order_fill_sortbuf-master.opt
+++ b/mysql-test/t/order_fill_sortbuf-master.opt
@@ -1 +1 @@
---set-variable=sort_buffer=32804
+--sort_buffer=32804
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 6b81ff66c7f..9a49d537ea2 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -165,69 +165,15 @@ int handle_options(int *argc, char ***argv,
       option_is_loose=   0;
 
       cur_arg++;		/* skip '-' */
-      if (*cur_arg == '-' || *cur_arg == 'O') /* check for long option, */
-      {                                       /* --set-variable, or -O  */
-	if (*cur_arg == 'O')
-	{
-	  must_be_var= 1;
-
-	  if (!(*++cur_arg))	/* If not -Ovar=# */
-	  {
-	    /* the argument must be in next argv */
-	    if (!*++pos)
-	    {
-	      if (my_getopt_print_errors)
-                my_getopt_error_reporter(ERROR_LEVEL,
-                                         "%s: Option '-O' requires an argument",
-                                         my_progname);
-	      return EXIT_ARGUMENT_REQUIRED;
-	    }
-	    cur_arg= *pos;
-	    (*argc)--;
-	  }
-	}
-	else if (!getopt_compare_strings(cur_arg, "-set-variable", 13))
-	{
-	  must_be_var= 1;
-	  if (cur_arg[13] == '=')
-	  {
-	    cur_arg+= 14;
-	    if (!*cur_arg)
-	    {
-	      if (my_getopt_print_errors)
-                my_getopt_error_reporter(ERROR_LEVEL,
-                                         "%s: Option '--set-variable' requires an argument",
-                                         my_progname);
-	      return EXIT_ARGUMENT_REQUIRED;
-	    }
-	  }
-	  else if (cur_arg[14]) /* garbage, or another option. break out */
-	    must_be_var= 0;
-	  else
-	  {
-	    /* the argument must be in next argv */
-	    if (!*++pos)
-	    {
-	      if (my_getopt_print_errors)
-                my_getopt_error_reporter(ERROR_LEVEL,
-                                         "%s: Option '--set-variable' requires an argument",
-                                         my_progname);
-	      return EXIT_ARGUMENT_REQUIRED;
-	    }
-	    cur_arg= *pos;
-	    (*argc)--;
-	  }
-	}
-	else if (!must_be_var)
-	{
-	  if (!*++cur_arg)	/* skip the double dash */
-	  {
-	    /* '--' means end of options, look no further */
-	    end_of_options= 1;
-	    (*argc)--;
-	    continue;
-	  }
-	}
+      if (*cur_arg == '-')      /* check for long option, */
+      {
+        if (!*++cur_arg)	/* skip the double dash */
+        {
+          /* '--' means end of options, look no further */
+          end_of_options= 1;
+          (*argc)--;
+          continue;
+        }
 	opt_str= check_struct_option(cur_arg, key_name);
 	optend= strcend(opt_str, '=');
 	length= (uint) (optend - opt_str);
@@ -307,12 +253,7 @@ int handle_options(int *argc, char ***argv,
 	  {
             if (my_getopt_skip_unknown)
             {
-              /*
-                preserve all the components of this unknown option, this may
-                occurr when the user provides options like: "-O foo" or
-                "--set-variable foo" (note that theres a space in there)
-                Generally, these kind of options are to be avoided
-              */
+              /* Preserve all the components of this unknown option. */
               do {
                 (*argv)[argvpos++]= *first++;
               } while (first <= pos);
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);
diff --git a/sql-bench/Comments/mysql.benchmark b/sql-bench/Comments/mysql.benchmark
index 9c28e8e506b..628903dee3b 100644
--- a/sql-bench/Comments/mysql.benchmark
+++ b/sql-bench/Comments/mysql.benchmark
@@ -16,7 +16,7 @@
 
 # Start MySQL
 
-bin/safe_mysqld -O key_buffer=16M &
+bin/safe_mysqld --key_buffer=16M &
 
 #
 # Now we run the test that can be found in the sql-bench directory in the
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 3f2b9cf3093..3e1929a6565 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -2019,7 +2019,7 @@ extern MYSQL_PLUGIN_IMPORT bool mysqld_embedded;
 #endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */
 #ifdef MYSQL_SERVER
 extern bool opt_large_files, server_id_supplied;
-extern bool opt_update_log, opt_bin_log, opt_error_log;
+extern bool opt_bin_log, opt_error_log;
 extern my_bool opt_log, opt_slow_log;
 extern ulonglong log_output_options;
 extern my_bool opt_log_queries_not_using_indexes;
diff --git a/sql/mysql_priv.h.pp b/sql/mysql_priv.h.pp
index d874a2591d1..ef1cb1fd02e 100644
--- a/sql/mysql_priv.h.pp
+++ b/sql/mysql_priv.h.pp
@@ -10075,7 +10075,6 @@ struct system_variables
   char* dynamic_variables_ptr;
   uint dynamic_variables_head;
   uint dynamic_variables_size;
-  ulonglong myisam_max_extra_sort_file_size;
   ulonglong myisam_max_sort_file_size;
   ulonglong max_heap_table_size;
   ulonglong tmp_table_size;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3799562968e..2e908eb3366 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -358,7 +358,7 @@ static mysql_cond_t COND_thread_cache, COND_flush_thread_cache;
 
 /* Global variables */
 
-bool opt_update_log, opt_bin_log, opt_ignore_builtin_innodb= 0;
+bool opt_bin_log, opt_ignore_builtin_innodb= 0;
 my_bool opt_log, opt_slow_log;
 ulonglong log_output_options;
 my_bool opt_log_queries_not_using_indexes= 0;
@@ -4005,53 +4005,6 @@ static int init_server_components()
   }
 
   /* need to configure logging before initializing storage engines */
-  if (opt_update_log)
-  {
-    /*
-      Update log is removed since 5.0. But we still accept the option.
-      The idea is if the user already uses the binlog and the update log,
-      we completely ignore any option/variable related to the update log, like
-      if the update log did not exist. But if the user uses only the update
-      log, then we translate everything into binlog for him (with warnings).
-      Implementation of the above :
-      - If mysqld is started with --log-update and --log-bin,
-      ignore --log-update (print a warning), push a warning when SQL_LOG_UPDATE
-      is used,
-      This will completely ignore SQL_LOG_UPDATE
-      - If mysqld is started with --log-update only,
-      change it to --log-bin (with the filename passed to log-update,
-      plus '-bin') (print a warning), push a warning when SQL_LOG_UPDATE is
-      used.
-      This will translate SQL_LOG_UPDATE to SQL_LOG_BIN.
-    */
-    if (opt_bin_log)
-    {
-      opt_sql_bin_update= 0;
-      sql_print_error("The update log is no longer supported by MySQL in \
-version 5.0 and above. It is replaced by the binary log.");
-    }
-    else
-    {
-      opt_sql_bin_update= 1;
-      opt_bin_log= 1;
-      if (opt_update_logname)
-      {
-        /* as opt_bin_log==0, no need to free opt_bin_logname */
-        if (!(opt_bin_logname= my_strdup(opt_update_logname, MYF(MY_WME))))
-        {
-          sql_print_error("Out of memory");
-          return EXIT_OUT_OF_MEMORY;
-        }
-        sql_print_error("The update log is no longer supported by MySQL in \
-version 5.0 and above. It is replaced by the binary log. Now starting MySQL \
-with --log-bin='%s' instead.",opt_bin_logname);
-      }
-      else
-        sql_print_error("The update log is no longer supported by MySQL in \
-version 5.0 and above. It is replaced by the binary log. Now starting MySQL \
-with --log-bin instead.");
-    }
-  }
   if (opt_log_slave_updates && !opt_bin_log)
   {
     sql_print_warning("You need to use --log-bin to make "
@@ -6281,9 +6234,6 @@ Can't be set to 1 if --log-slave-updates is used.",
    (uchar**)&global_system_variables.tx_isolation,
    (uchar**)&global_system_variables.tx_isolation, &tx_isolation_typelib,
    GET_ENUM, REQUIRED_ARG, ISO_REPEATABLE_READ, 0, 0, 0, 0, 0},
-  {"use-symbolic-links", 's', "Enable symbolic link support. Deprecated option; use --symbolic-links instead.",
-   (uchar**) &my_use_symdir, (uchar**) &my_use_symdir, 0, GET_BOOL, NO_ARG,
-   IF_PURIFY(0,1), 0, 0, 0, 0, 0},
   {"user", 'u', "Run mysqld daemon as user.", 0, 0, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
   {"verbose", 'v', "Used with --help option for detailed help.",
@@ -6964,7 +6914,6 @@ static int mysql_init_variables(void)
   mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0;
   myisam_test_invalid_symlink= test_if_data_home_dir;
   opt_log= opt_slow_log= 0;
-  opt_update_log= 0;
   opt_bin_log= 0;
   opt_disable_networking= opt_skip_show_db=0;
   opt_ignore_builtin_innodb= 0;
@@ -7661,7 +7610,7 @@ static void set_server_version(void)
   if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"))
     end= strmov(end, "-debug");
 #endif
-  if (opt_log || opt_update_log || opt_slow_log || opt_bin_log)
+  if (opt_log || opt_slow_log || opt_bin_log)
     strmov(end, "-log");                        // This may slow down system
 }
 
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index d54ff1d2779..12cb1224064 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -64,9 +64,9 @@
   The following handles the differences when this is linked between the
   client and the server.
 
-  This gives an error if a too big packet is found
-  The server can change this with the -O switch, but because the client
-  can't normally do this the client should have a bigger max_allowed_packet.
+  This gives an error if a too big packet is found.
+  The server can change this, but because the client can't normally do this
+  the client should have a bigger max_allowed_packet.
 */
 
 #if defined(__WIN__) || !defined(MYSQL_SERVER)
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 7ea8c75e43e..9861c03137f 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -2827,26 +2827,26 @@ ER_TOO_BIG_ROWSIZE 42000
         swe "För stor total radlängd. Den högst tillåtna radlängden, förutom BLOBs, är %ld. Ändra några av dina fält till BLOB"
         ukr "Задовга строка. Найбільшою довжиною строки, не рахуючи BLOB, є %ld. Вам потрібно привести деякі стовбці до типу BLOB"
 ER_STACK_OVERRUN  
-        cze "P-Břetečení zásobníku threadu: použito %ld z %ld. Použijte 'mysqld -O thread_stack=#' k zadání většího zásobníku"
-        dan "Thread stack brugt:  Brugt: %ld af en %ld stak.  Brug 'mysqld -O thread_stack=#' for at allokere en større stak om nødvendigt"
-        nla "Thread stapel overrun:  Gebruikte: %ld van een %ld stack. Gebruik 'mysqld -O thread_stack=#' om een grotere stapel te definieren (indien noodzakelijk)."
-        eng "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed"
-        jps "Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld -O thread_stack=#' と指定してください",
-        fre "Débordement de la pile des tâches (Thread stack). Utilisées: %ld pour une pile de %ld.  Essayez 'mysqld -O thread_stack=#' pour indiquer une plus grande valeur"
-        ger "Thread-Stack-Überlauf. Benutzt: %ld von %ld Stack. 'mysqld -O thread_stack=#' verwenden, um bei Bedarf einen größeren Stack anzulegen"
-        greek "Stack overrun στο thread:  Used: %ld of a %ld stack.  Παρακαλώ χρησιμοποιείστε 'mysqld -O thread_stack=#' για να ορίσετε ένα μεγαλύτερο stack αν χρειάζεται"
-        hun "Thread verem tullepes:  Used: %ld of a %ld stack. Hasznalja a 'mysqld -O thread_stack=#' nagyobb verem definialasahoz"
-        ita "Thread stack overrun:  Usati: %ld di uno stack di %ld.  Usa 'mysqld -O thread_stack=#' per specificare uno stack piu` grande."
-        jpn "Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld -O thread_stack=#' と指定してください"
-        kor "쓰레드 스택이 넘쳤습니다.  사용: %ld개 스택: %ld개.  만약 필요시 더큰 스택을 원할때에는 'mysqld -O thread_stack=#' 를 정의하세요"
-        por "Estouro da pilha do 'thread'. Usados %ld de uma pilha de %ld. Use 'mysqld -O thread_stack=#' para especificar uma pilha maior, se necessário"
-        rum "Stack-ul thread-ului a fost depasit (prea mic):  Folositi: %ld intr-un stack de %ld.  Folositi 'mysqld -O thread_stack=#' ca sa specifici un stack mai mare"
-        rus "Стек потоков переполнен:  использовано: %ld из %ld стека.  Применяйте 'mysqld -O thread_stack=#' для указания большего размера стека, если необходимо"
-        serbian "Prepisivanje thread stack-a:  Upotrebljeno: %ld od %ld stack memorije.  Upotrebite 'mysqld -O thread_stack=#' da navedete veći stack ako je potrebno"
-        slo "Pretečenie zásobníku vlákna:  použité: %ld z %ld.  Použite 'mysqld -O thread_stack=#' k zadaniu väčšieho zásobníka"
-        spa "Sobrecarga de la pila de thread:  Usada: %ld de una %ld pila.  Use 'mysqld -O thread_stack=#' para especificar una mayor pila si necesario"
-        swe "Trådstacken tog slut:  Har använt %ld av %ld bytes.  Använd 'mysqld -O thread_stack=#' ifall du behöver en större stack"
-        ukr "Стек гілок переповнено:  Використано: %ld з %ld. Використовуйте 'mysqld -O thread_stack=#' аби зазначити більший стек, якщо необхідно"
+        cze "P-Břetečení zásobníku threadu: použito %ld z %ld. Použijte 'mysqld --thread_stack=#' k zadání většího zásobníku"
+        dan "Thread stack brugt:  Brugt: %ld af en %ld stak.  Brug 'mysqld --thread_stack=#' for at allokere en større stak om nødvendigt"
+        nla "Thread stapel overrun:  Gebruikte: %ld van een %ld stack. Gebruik 'mysqld --thread_stack=#' om een grotere stapel te definieren (indien noodzakelijk)."
+        eng "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld --thread_stack=#' to specify a bigger stack if needed"
+        jps "Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld --thread_stack=#' と指定してください",
+        fre "Débordement de la pile des tâches (Thread stack). Utilisées: %ld pour une pile de %ld.  Essayez 'mysqld --thread_stack=#' pour indiquer une plus grande valeur"
+        ger "Thread-Stack-Überlauf. Benutzt: %ld von %ld Stack. 'mysqld --thread_stack=#' verwenden, um bei Bedarf einen größeren Stack anzulegen"
+        greek "Stack overrun στο thread:  Used: %ld of a %ld stack.  Παρακαλώ χρησιμοποιείστε 'mysqld --thread_stack=#' για να ορίσετε ένα μεγαλύτερο stack αν χρειάζεται"
+        hun "Thread verem tullepes:  Used: %ld of a %ld stack. Hasznalja a 'mysqld --thread_stack=#' nagyobb verem definialasahoz"
+        ita "Thread stack overrun:  Usati: %ld di uno stack di %ld.  Usa 'mysqld --thread_stack=#' per specificare uno stack piu` grande."
+        jpn "Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld --thread_stack=#' と指定してください"
+        kor "쓰레드 스택이 넘쳤습니다.  사용: %ld개 스택: %ld개.  만약 필요시 더큰 스택을 원할때에는 'mysqld --thread_stack=#' 를 정의하세요"
+        por "Estouro da pilha do 'thread'. Usados %ld de uma pilha de %ld. Use 'mysqld --thread_stack=#' para especificar uma pilha maior, se necessário"
+        rum "Stack-ul thread-ului a fost depasit (prea mic):  Folositi: %ld intr-un stack de %ld.  Folositi 'mysqld --thread_stack=#' ca sa specifici un stack mai mare"
+        rus "Стек потоков переполнен:  использовано: %ld из %ld стека.  Применяйте 'mysqld --thread_stack=#' для указания большего размера стека, если необходимо"
+        serbian "Prepisivanje thread stack-a:  Upotrebljeno: %ld od %ld stack memorije.  Upotrebite 'mysqld --thread_stack=#' da navedete veći stack ako je potrebno"
+        slo "Pretečenie zásobníku vlákna:  použité: %ld z %ld.  Použite 'mysqld --thread_stack=#' k zadaniu väčšieho zásobníka"
+        spa "Sobrecarga de la pila de thread:  Usada: %ld de una %ld pila.  Use 'mysqld --thread_stack=#' para especificar una mayor pila si necesario"
+        swe "Trådstacken tog slut:  Har använt %ld av %ld bytes.  Använd 'mysqld --thread_stack=#' ifall du behöver en större stack"
+        ukr "Стек гілок переповнено:  Використано: %ld з %ld. Використовуйте 'mysqld --thread_stack=#' аби зазначити більший стек, якщо необхідно"
 ER_WRONG_OUTER_JOIN 42000 
         cze "V OUTER JOIN byl nalezen k-Břížový odkaz. Prověřte ON podmínky"
         dan "Krydsreferencer fundet i OUTER JOIN; check dine ON conditions"
@@ -5485,10 +5485,10 @@ ER_FAILED_ROUTINE_BREAK_BINLOG
         ger "Eine Routine, die weder NO SQL noch READS SQL DATA in der Deklaration hat, schlug fehl und Binärlogging ist aktiv. Wenn Nicht-Transaktions-Tabellen aktualisiert wurden, enthält das Binärlog ihre Änderungen nicht"
 ER_BINLOG_UNSAFE_ROUTINE
         eng "This function has none of DETERMINISTIC, NO SQL, or READS SQL DATA in its declaration and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)"
-        ger "Diese Routine hat weder DETERMINISTIC, NO SQL noch READS SQL DATA in der Deklaration und Binärlogging ist aktiv (*vielleicht* sollten Sie die weniger sichere Variable log_bin_trust_routine_creators verwenden)"
+        ger "Diese Routine hat weder DETERMINISTIC, NO SQL noch READS SQL DATA in der Deklaration und Binärlogging ist aktiv (*vielleicht* sollten Sie die weniger sichere Variable log_bin_trust_function_creators verwenden)"
 ER_BINLOG_CREATE_ROUTINE_NEED_SUPER
         eng "You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)"
-        ger "Sie haben keine SUPER-Berechtigung und Binärlogging ist aktiv (*vielleicht* sollten Sie die weniger sichere Variable log_bin_trust_routine_creators verwenden)"
+        ger "Sie haben keine SUPER-Berechtigung und Binärlogging ist aktiv (*vielleicht* sollten Sie die weniger sichere Variable log_bin_trust_function_creators verwenden)"
 ER_EXEC_STMT_WITH_OPEN_CURSOR
         eng "You can't execute a prepared statement which has an open cursor associated with it. Reset the statement to re-execute it."
         ger "Sie können keine vorbereitete Anweisung ausführen, die mit einem geöffneten Cursor verknüpft ist. Setzen Sie die Anweisung zurück, um sie neu auszuführen"
@@ -5538,8 +5538,8 @@ ER_TRG_IN_WRONG_SCHEMA
         eng "Trigger in wrong schema"
         ger "Trigger im falschen Schema"
 ER_STACK_OVERRUN_NEED_MORE
-        eng "Thread stack overrun:  %ld bytes used of a %ld byte stack, and %ld bytes needed.  Use 'mysqld -O thread_stack=#' to specify a bigger stack."
-        ger "Thread-Stack-Überlauf: %ld Bytes eines %ld-Byte-Stacks in Verwendung, und %ld Bytes benötigt. Verwenden Sie 'mysqld -O thread_stack=#', um einen größeren Stack anzugeben"
+        eng "Thread stack overrun:  %ld bytes used of a %ld byte stack, and %ld bytes needed.  Use 'mysqld --thread_stack=#' to specify a bigger stack."
+        ger "Thread-Stack-Überlauf: %ld Bytes eines %ld-Byte-Stacks in Verwendung, und %ld Bytes benötigt. Verwenden Sie 'mysqld --thread_stack=#', um einen größeren Stack anzugeben"
 ER_TOO_LONG_BODY 42000 S1009
         eng "Routine body for '%-.100s' is too long"
         ger "Routinen-Body für '%-.100s' ist zu lang"
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 538a8a42ef6..8ce3cee3c36 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -330,7 +330,6 @@ typedef struct system_variables
   uint dynamic_variables_head;  /* largest valid variable offset */
   uint dynamic_variables_size;  /* how many bytes are in use */
   
-  ulonglong myisam_max_extra_sort_file_size;
   ulonglong max_heap_table_size;
   ulonglong tmp_table_size;
   ulonglong long_query_time;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index ddf7dcb22d0..26fb4e4e4e4 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -607,7 +607,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   /*
     log_on is about delayed inserts only.
     By default, both logs are enabled (this won't cause problems if the server
-    runs without --log-update or --log-bin).
+    runs without --log-bin).
   */
   bool log_on= ((thd->variables.option_bits & OPTION_BIN_LOG) ||
                 (!(thd->security_ctx->master_access & SUPER_ACL)));
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 80eee89c8a9..d500d772b80 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -1494,8 +1494,7 @@ static Sys_var_mybool Sys_readonly(
 static Sys_var_ulong Sys_read_rnd_buff_size(
        "read_rnd_buffer_size",
        "When reading rows in sorted order after a sort, the rows are read "
-       "through this buffer to avoid a disk seeks. If not set, then it's "
-       "set to the value of record_buffer",
+       "through this buffer to avoid a disk seeks",
        SESSION_VAR(read_rnd_buff_size), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, INT_MAX32), DEFAULT(256*1024), BLOCK_SIZE(1));
 
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index e4eccdc1dc6..612dd6f3ce1 100644
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
@@ -252,9 +252,6 @@ static struct my_option my_long_options[] =
   {"set-collation", OPT_SET_COLLATION,
    "Change the collation used by the index",
    (uchar**) &set_collation_name, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"set-variable", 'O',
-   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"silent", 's',
    "Only print errors. One can use two -s to make myisamchk very silent.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -365,10 +362,6 @@ static void usage(void)
   printf("\
   -H, --HELP          Display this help and exit.\n\
   -?, --help          Display this help and exit.\n\
-  -O, --set-variable var=option.\n\
-                      Change the value of a variable. Please note that\n\
-                      this option is deprecated; you can set variables\n\
-                      directly with '--variable-name=value'.\n\
   -t, --tmpdir=path   Path for temporary files. Multiple paths can be\n\
                       specified, separated by ");
 #if defined( __WIN__) || defined(__NETWARE__)
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 17a7ddb5855..a6bf70b6f83 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -25,7 +25,7 @@ socket		= @MYSQL_UNIX_ADDR@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer_size = 384M
 max_allowed_packet = 1M
 table_open_cache = 512
@@ -115,7 +115,7 @@ server-id	= 1
 
 # Point the following paths to different dedicated disks
 #tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
+#log-bin 	= /path-to-dedicated-directory/hostname
 
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index bbdfdb32a96..92839b8fc2c 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -25,7 +25,7 @@ socket		= @MYSQL_UNIX_ADDR@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer_size = 256M
 max_allowed_packet = 1M
 table_open_cache = 256
@@ -115,7 +115,7 @@ server-id	= 1
 
 # Point the following paths to different dedicated disks
 #tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
+#log-bin 	= /path-to-dedicated-directory/hostname
 
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index 88113d0a8d4..b219d02a7be 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -26,7 +26,7 @@ socket		= @MYSQL_UNIX_ADDR@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer_size = 16M
 max_allowed_packet = 1M
 table_open_cache = 64
@@ -113,7 +113,7 @@ server-id	= 1
 
 # Point the following paths to different dedicated disks
 #tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
+#log-bin 	= /path-to-dedicated-directory/hostname
 
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index b4461ebf90f..d789a175603 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -26,7 +26,7 @@ socket		= @MYSQL_UNIX_ADDR@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer_size = 16K
 max_allowed_packet = 1M
 table_open_cache = 4
diff --git a/support-files/mysql-multi.server.sh b/support-files/mysql-multi.server.sh
index 31020029354..a036374a4b2 100644
--- a/support-files/mysql-multi.server.sh
+++ b/support-files/mysql-multi.server.sh
@@ -18,8 +18,8 @@
 # A typical multi-instance /etc/my.cnf file would look like:
 # [mysqld]
 # basedir=...
-# set-variable = key_buffer_size=16M
-# set-variable = max_allowed_packet=1M
+# key_buffer_size=16M
+# max_allowed_packet=1M
 # [mysql_multi_server]
 # svr1-datadir=/foo1/bar
 # svr2-datadir=/foo2/bar
diff --git a/tests/big_record.pl b/tests/big_record.pl
index fbe94e3540f..cd80488581a 100755
--- a/tests/big_record.pl
+++ b/tests/big_record.pl
@@ -2,7 +2,7 @@
 
 # This is a test with stores big records in a blob.
 # Note that for the default test the mysql server should have been
-# started with at least 'mysqld -O max_allowed_packet=30M' and you should have
+# started with at least 'mysqld --max_allowed_packet=30M' and you should have
 # at least 256M memory in your computer.
 
 use DBI;
diff --git a/tests/myisam-big-rows.tst b/tests/myisam-big-rows.tst
index 56c06f4820f..97147999f87 100644
--- a/tests/myisam-big-rows.tst
+++ b/tests/myisam-big-rows.tst
@@ -1,7 +1,7 @@
 #
 # Test rows with length above > 16M
 # Note that for this to work, you should start mysqld with
-# -O max_allowed_packet=32M
+# --max_allowed_packet=32M
 #
 
 drop table if exists t1;
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 1fa7f930ab8..8f4c44e2c82 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -5673,7 +5673,7 @@ static void test_stmt_close()
 }
 
 
-/* Test simple set-variable prepare */
+/* Test simple set variable prepare */
 
 static void test_set_variable()
 {