WL#5154 Remove deprecated 4.1 features

A set of program options and variables was deprecated in
MySQL 5.1, and is hereby removed.



client/mysql.cc:
  --no-auto-rehash (-A)  is no longer deprecated
  --no-named-commands (-g) is now removed
  --skip-line-numbers (-L) is no longer deprecated
  --set-variable (-O) is now removed
  --no-pager is now removed
client/mysqlbinlog.cc:
  --position is now removed (use --start-position)
  -j is now equivalent with --start-position
client/mysqldump.c:
  --first-slave is now removed
  --no-set-names (-N) is now removed
  --set-variable (-O) is now removed
mysql-test/include/default_mysqld.cnf:
  default-character-set is removed as an option
  character-set-server is equivalent.
mysql-test/t/bug47671-master.opt:
  default-character-set option is removed
  character-set-server is equivalent
mysql-test/t/ctype_latin1_de-master.opt:
  default-character-set option is removed
  character-set-server is equivalent
mysql-test/t/ctype_ucs2_def-master.opt:
  default-collation is removed
  collation-server is equicalent
scripts/mysqld_multi.sh:
  --config-file has been superseded by
  --defaults-extra-file
sql/mysql_priv.h:
  Removed the version number in the deprecation
  warning text, as decided by ServerPT.
sql/mysqld.cc:
  --default-character-set (-C) is removed
  --default-collation is removed
  --log-long-format (-0) is removed
  --safe-show-database is removed
  --set-variable (-O) is removed
sql/sql_yacc.yy:
  The FRAC_SECOND keyword is removed
sql/sys_vars.cc:
  The sql_log_update system variable is removed

17 files changed, 22 insertions, 124 deletions

diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
index c54ac93133b..46fdda7df84 100644
--- a/mysql-test/include/default_mysqld.cnf
+++ b/mysql-test/include/default_mysqld.cnf
@@ -17,7 +17,7 @@
 [mysqld]
 open-files-limit=           1024
 local-infile
-default-character-set=      latin1
+character-set-server=      latin1
 
 # Increase default connect_timeout to avoid intermittent
 # disconnects when test servers are put under load see BUG#28359
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index 7bcaf5567cf..c3f210edee5 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -678,11 +678,6 @@ timestampadd(WEEK, 1, date)
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
 timestampadd(SQL_TSI_SECOND, 1, date)
 2003-01-02 00:00:01
-select timestampadd(SQL_TSI_FRAC_SECOND, 1, date) from t1;
-timestampadd(SQL_TSI_FRAC_SECOND, 1, date)
-2003-01-02 00:00:00.000001
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
 select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
 a
 3
@@ -713,11 +708,6 @@ a
 select timestampdiff(SQL_TSI_SECOND, '2001-02-01 12:59:59', '2001-05-01 12:58:58') as a;
 a
 7689539
-select timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a;
-a
-7689538999999
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
 select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
 timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
 timestampdiff(SQL_TSI_DAY, '1996-02-01', '1996-03-01') as a3,
@@ -1082,13 +1072,6 @@ week(20061108), week(20061108.01), week(20061108085411.000002);
 isnull(week(now() + 0))	isnull(week(now() + 0.2))	week(20061108)	week(20061108.01)	week(20061108085411.000002)
 0	0	45	45	45
 End of 4.1 tests
-explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
-timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
-Note	1003	select timestampdiff(WEEK,'2001-02-01','2001-05-01') AS `a1`,timestampdiff(SECOND_FRAC,'2001-02-01 12:59:59.120000','2001-05-01 12:58:58.119999') AS `a2`
 select time_format('100:00:00', '%H %k %h %I %l');
 time_format('100:00:00', '%H %k %h %I %l')
 100 100 04 04 4
@@ -1282,24 +1265,6 @@ DATE_ADD(20071108,         INTERVAL 1 DAY)
 select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND;
 LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND
 2007-12-30 23:59:59
-SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
-TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18')
-2008-02-18 00:00:00.000001
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
-SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
-TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18')
-86400000000
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
-SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND)' at line 1
-SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND)' at line 1
-SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
-SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
 select date_add('1000-01-01 00:00:00', interval '1.03:02:01.05' day_microsecond);
 date_add('1000-01-01 00:00:00', interval '1.03:02:01.05' day_microsecond)
 1000-01-02 03:02:01.050000
diff --git a/mysql-test/r/locale.result b/mysql-test/r/locale.result
index af7f9e3c132..b52ed8070f9 100644
--- a/mysql-test/r/locale.result
+++ b/mysql-test/r/locale.result
@@ -51,7 +51,7 @@ DROP TABLE t1;
 #
 SET lc_messages=sr_YU;
 Warnings:
-Warning	1287	'sr_YU' is deprecated; use 'sr_RS' instead
+Warning	1287	'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
 SHOW VARIABLES LIKE 'lc_messages';
 Variable_name	Value
 lc_messages	sr_RS
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 097e51a78de..55e68e9f8f3 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -187,7 +187,7 @@ DELIMITER ;
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
---- --position --
+--- --start-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
@@ -388,7 +388,7 @@ DELIMITER ;
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
---- --position --
+--- --start-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index a66b722ba4b..f8faeaf76ec 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -101,12 +101,6 @@ The following options may be given as the first argument:
   --date-format=name  The DATE format (ignored)
   --datetime-format=name 
                       The DATETIME format (ignored)
-  -C, --default-character-set=name 
-                      Set the default character set (deprecated option, use
-                      --character-set-server instead).
-  --default-collation=name 
-                      Set the default collation (deprecated option, use
-                      --collation-server instead).
   --default-storage-engine=name 
                       The default storage engine for new tables
   --default-time-zone=name 
@@ -244,10 +238,6 @@ The following options may be given as the first argument:
                       can safely set this to TRUE
   --log-error[=name]  Error log file
   --log-isam[=name]   Log all MyISAM changes to file.
-  -0, --log-long-format 
-                      Log some extra information to update log. Please note
-                      that this option is deprecated; see --log-short-format
-                      option.
   --log-output=name   Syntax: log-output=value[,value...], where "value" could
                       be TABLE, FILE or NONE
   --log-queries-not-using-indexes 
@@ -604,8 +594,6 @@ The following options may be given as the first argument:
   --rpl-recovery-rank=# 
                       Unused, will be removed
   --safe-mode         Skip some optimize stages (for testing).
-  --safe-show-database 
-                      Deprecated option; use GRANT SHOW DATABASES instead...
   --safe-user-create  Don't allow new user creation by the user who has no
                       write privileges to the mysql.user table.
   --secure-auth       Disallow authentication for accounts that have old
@@ -615,10 +603,6 @@ The following options may be given as the first argument:
                       files within specified directory
   --server-id=#       Uniquely identifies the server instance in the community
                       of replication partners
-  -O, --set-variable=name 
-                      Change the value of a variable. Please note that this
-                      option is deprecated;you can set variables directly with
-                      --variable-name=value.
   --show-slave-auth-info 
                       Show user and password in SHOW SLAVE HOSTS on this master
   --skip-grant-tables Start without grant tables. This gives all users FULL
@@ -793,8 +777,6 @@ connect-timeout                                   10
 console                                           FALSE
 date-format                                       %Y-%m-%d
 datetime-format                                   %Y-%m-%d %H:%i:%s
-default-character-set                             latin1
-default-collation                                 latin1_swedish_ci
 default-storage-engine                            MyISAM
 default-time-zone                                 (No default value)
 default-week-format                               0
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index e7048c71a48..abc7bdb2655 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -101,12 +101,6 @@ The following options may be given as the first argument:
   --date-format=name  The DATE format (ignored)
   --datetime-format=name 
                       The DATETIME format (ignored)
-  -C, --default-character-set=name 
-                      Set the default character set (deprecated option, use
-                      --character-set-server instead).
-  --default-collation=name 
-                      Set the default collation (deprecated option, use
-                      --collation-server instead).
   --default-storage-engine=name 
                       The default storage engine for new tables
   --default-time-zone=name 
@@ -243,10 +237,6 @@ The following options may be given as the first argument:
                       can safely set this to TRUE
   --log-error[=name]  Error log file
   --log-isam[=name]   Log all MyISAM changes to file.
-  -0, --log-long-format 
-                      Log some extra information to update log. Please note
-                      that this option is deprecated; see --log-short-format
-                      option.
   --log-output=name   Syntax: log-output=value[,value...], where "value" could
                       be TABLE, FILE or NONE
   --log-queries-not-using-indexes 
@@ -604,8 +594,6 @@ The following options may be given as the first argument:
   --rpl-recovery-rank=# 
                       Unused, will be removed
   --safe-mode         Skip some optimize stages (for testing).
-  --safe-show-database 
-                      Deprecated option; use GRANT SHOW DATABASES instead...
   --safe-user-create  Don't allow new user creation by the user who has no
                       write privileges to the mysql.user table.
   --secure-auth       Disallow authentication for accounts that have old
@@ -615,10 +603,6 @@ The following options may be given as the first argument:
                       files within specified directory
   --server-id=#       Uniquely identifies the server instance in the community
                       of replication partners
-  -O, --set-variable=name 
-                      Change the value of a variable. Please note that this
-                      option is deprecated;you can set variables directly with
-                      --variable-name=value.
   --shared-memory     Enable the shared memory
   --shared-memory-base-name=name 
                       Base name of shared memory
@@ -797,8 +781,6 @@ connect-timeout                                   10
 console                                           FALSE
 date-format                                       %Y-%m-%d
 datetime-format                                   %Y-%m-%d %H:%i:%s
-default-character-set                             latin1
-default-collation                                 latin1_swedish_ci
 default-storage-engine                            MyISAM
 default-time-zone                                 (No default value)
 default-week-format                               0
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index a8437961117..9701a939b19 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -569,9 +569,6 @@ set sql_big_tables=1;
 set sql_buffer_result=1;
 set sql_log_bin=1;
 set sql_log_off=1;
-set sql_log_update=1;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
 set sql_low_priority_updates=1;
 set sql_quote_show_create=1;
 set sql_safe_updates=1;
diff --git a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
index 9a645baead0..ebb8bb6c718 100644
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
@@ -161,14 +161,14 @@ connection master;
 remove_file $MYSQLTEST_VARDIR/tmp/master.sql;
 
 
-# this test for position option
+# this test for start-position option
 # By setting this position to 416, we should only get the create of t3
 --disable_query_log
 select "--- Test 2 position test --" as "";
 --enable_query_log
 let $MYSQLD_DATADIR= `select @@datadir;`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=417 --stop-position=570 $MYSQLD_DATADIR/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --start-position=417 --stop-position=570 $MYSQLD_DATADIR/master-bin.000001
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -266,7 +266,7 @@ let $MYSQLD_DATADIR= `select @@datadir;`;
 select "--- Test 7 reading stdin w/position --" as "";
 --enable_query_log
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --position=417 --stop-position=570 - < $MYSQLD_DATADIR/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --start-position=417 --stop-position=570 - < $MYSQLD_DATADIR/master-bin.000001
        
 # Bug#16217 (mysql client did not know how not switch its internal charset)
 --disable_query_log
diff --git a/mysql-test/t/bug47671-master.opt b/mysql-test/t/bug47671-master.opt
index 0afdf49e022..ad54fbc3467 100644
--- a/mysql-test/t/bug47671-master.opt
+++ b/mysql-test/t/bug47671-master.opt
@@ -1 +1 @@
---default-character-set=utf8 --skip-character-set-client-handshake
+--character-set-server=utf8 --skip-character-set-client-handshake
diff --git a/mysql-test/t/ctype_latin1_de-master.opt b/mysql-test/t/ctype_latin1_de-master.opt
index 79fdb1c63dc..0c072424de9 100644
--- a/mysql-test/t/ctype_latin1_de-master.opt
+++ b/mysql-test/t/ctype_latin1_de-master.opt
@@ -1 +1 @@
---default-character-set=latin1 --default-collation=latin1_german2_ci
+--character-set-server=latin1 --collation-server=latin1_german2_ci
diff --git a/mysql-test/t/ctype_ucs2_def-master.opt b/mysql-test/t/ctype_ucs2_def-master.opt
index 84d2a52b639..711ec42bd8a 100644
--- a/mysql-test/t/ctype_ucs2_def-master.opt
+++ b/mysql-test/t/ctype_ucs2_def-master.opt
@@ -1 +1 @@
---default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1
+--collation-server=ucs2_unicode_ci --character-set-server=ucs2,latin1
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
index 95b8a8ec38d..219a857a597 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -345,10 +345,6 @@ select date_add(date,INTERVAL "1" QUARTER) from t1;
 select timestampadd(MINUTE, 1, date) from t1;
 select timestampadd(WEEK, 1, date) from t1;
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
-# mysqltest.c discards an expected 'deprecated' warning on prepare stage
---disable_ps_protocol
-select timestampadd(SQL_TSI_FRAC_SECOND, 1, date) from t1;
---enable_ps_protocol
 
 select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
 select timestampdiff(YEAR, '2002-05-01', '2001-01-01') as a;
@@ -360,10 +356,6 @@ select timestampdiff(SQL_TSI_HOUR, '2001-02-01', '2001-05-01') as a;
 select timestampdiff(SQL_TSI_DAY, '2001-02-01', '2001-05-01') as a;
 select timestampdiff(SQL_TSI_MINUTE, '2001-02-01 12:59:59', '2001-05-01 12:58:59') as a;
 select timestampdiff(SQL_TSI_SECOND, '2001-02-01 12:59:59', '2001-05-01 12:58:58') as a;
-# mysqltest.c discards an expected 'deprecated' warning on prepare stage
---disable_ps_protocol
-select timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a;
---enable_ps_protocol
 
 select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
        timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
@@ -602,9 +594,6 @@ select isnull(week(now() + 0)), isnull(week(now() + 0.2)),
 
 --echo End of 4.1 tests
 
-explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
-			timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
-
 #
 # Bug #10590: %h, %I, and %l format specifies should all return results in
 # the 0-11 range
@@ -797,27 +786,11 @@ select DATE_ADD(20071108,         INTERVAL 1 DAY);
 
 select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND;
 
-#
 # Bug#33834: FRAC_SECOND: Applicability not clear in documentation
 #
-# Show that he use of FRAC_SECOND, for anything other than
-# TIMESTAMPADD / TIMESTAMPDIFF, is a server error.
-
-# mysqltest.c discards an expected 'deprecated' warning on prepare stage
---disable_ps_protocol
-SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
-SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
---enable_ps_protocol
-
---error ER_PARSE_ERROR
-SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
---error ER_PARSE_ERROR
-SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);
-
---error ER_PARSE_ERROR
-SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
---error ER_PARSE_ERROR
-SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
+# Test case removed since FRAC_SECOND was deprecated and
+# removed as part of WL#5154
+#
 
 #
 # Bug #36466:
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index 55593bed124..f8172696215 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -65,13 +65,13 @@ select "--- --database --" as "";
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
 --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLD_DATADIR/master-bin.000001 2> /dev/null
 
-# this test for position option
+# this test for start-position option
 --disable_query_log
-select "--- --position --" as "";
+select "--- --start-position --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=1074 $MYSQLD_DATADIR/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --start-position=1074 $MYSQLD_DATADIR/master-bin.000002
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -103,11 +103,11 @@ select "--- --database --" as "";
 
 # Strangely but this works
 --disable_query_log
-select "--- --position --" as "";
+select "--- --start-position --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=1074 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --start-position=1074 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
 
 
 # Bug#7853 mysqlbinlog does not accept input from stdin
@@ -120,7 +120,7 @@ select "--- reading stdin --" as "";
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
---exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
+--exec $MYSQL_BINLOG --short-form --start-position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
 drop table t1,t2;
 
 #
diff --git a/mysql-test/t/ps-master.opt b/mysql-test/t/ps-master.opt
index 31c287d2bb5..1deeb6c9c63 100644
--- a/mysql-test/t/ps-master.opt
+++ b/mysql-test/t/ps-master.opt
@@ -1 +1 @@
---log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-output=table,file --log-slow-queries --log-queries-not-using-indexes
diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt
index aab832e2848..108caf42203 100644
--- a/mysql-test/t/show_check-master.opt
+++ b/mysql-test/t/show_check-master.opt
@@ -1 +1 @@
---log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
+--log-output=table,file --log-slow-queries --log-queries-not-using-indexes --myisam-recover=""
diff --git a/mysql-test/t/union-master.opt b/mysql-test/t/union-master.opt
index 3eb98fc3d6b..c852f488260 100644
--- a/mysql-test/t/union-master.opt
+++ b/mysql-test/t/union-master.opt
@@ -1 +1 @@
---log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-slow-queries --log-queries-not-using-indexes
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index d4b88fc6f9c..cab37510931 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -346,7 +346,6 @@ set sql_big_tables=1;
 set sql_buffer_result=1;
 set sql_log_bin=1;
 set sql_log_off=1;
-set sql_log_update=1;
 set sql_low_priority_updates=1;
 set sql_quote_show_create=1;
 set sql_safe_updates=1;