diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index 9471e7dd515..aa369d37635 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -1,7 +1,3 @@ -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; create table t1 (a int not null); insert into t1 values (1); @@ -981,8 +977,6 @@ DROP VIEW view_target2; DROP VIEW view_target3; DROP USER user20989@localhost; DROP DATABASE meow; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. # # Bug#28836669: Only first set of duplicate columns are reported for INSERT # diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 0272e9fc7d9..e000f3d0328 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -1,7 +1,3 @@ -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. CREATE TABLE t1(a int) ENGINE=EXAMPLE; ERROR 42000: Unknown storage engine 'EXAMPLE' INSTALL PLUGIN example SONAME 'ha_example.so'; @@ -244,8 +240,6 @@ UNINSTALL PLUGIN example; DROP USER bug51770@localhost; INSTALL PLUGIN example SONAME '../ha_example.so'; ERROR HY000: No paths allowed for shared library -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. # # Bug #28534414: NEGATIVE NUMBERS IN PLUGIN VARIABLES # NOT DISPLAYED CORRECTLY diff --git a/mysql-test/r/subquery_sj_all.result b/mysql-test/r/subquery_sj_all.result index 7b9a082cd77..9fbdd4accc7 100644 --- a/mysql-test/r/subquery_sj_all.result +++ b/mysql-test/r/subquery_sj_all.result @@ -1,7 +1,3 @@ -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=off'; set @old_opt_switch=@@optimizer_switch; set optimizer_switch='subquery_materialization_cost_based=off'; @@ -13536,5 +13532,3 @@ f1 f2 14:51:13 S DROP TABLE t1, t2; set optimizer_switch=default; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. diff --git a/mysql-test/r/subquery_sj_all_bka.result b/mysql-test/r/subquery_sj_all_bka.result index 2334635eec2..594ef685c0a 100644 --- a/mysql-test/r/subquery_sj_all_bka.result +++ b/mysql-test/r/subquery_sj_all_bka.result @@ -1,8 +1,4 @@ set optimizer_switch='batched_key_access=on,mrr_cost_based=off'; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=off'; set @old_opt_switch=@@optimizer_switch; set optimizer_switch='subquery_materialization_cost_based=off'; @@ -13539,6 +13535,4 @@ f1 f2 14:51:13 S DROP TABLE t1, t2; set optimizer_switch=default; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch=default; diff --git a/mysql-test/r/subquery_sj_all_bka_nobnl.result b/mysql-test/r/subquery_sj_all_bka_nobnl.result index f5c5dd7cf8d..80045176da0 100644 --- a/mysql-test/r/subquery_sj_all_bka_nobnl.result +++ b/mysql-test/r/subquery_sj_all_bka_nobnl.result @@ -1,8 +1,4 @@ set optimizer_switch='batched_key_access=on,block_nested_loop=off,mrr_cost_based=off'; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=off'; set @old_opt_switch=@@optimizer_switch; set optimizer_switch='subquery_materialization_cost_based=off'; @@ -13529,6 +13525,4 @@ f1 f2 14:51:13 S DROP TABLE t1, t2; set optimizer_switch=default; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch=default; diff --git a/mysql-test/r/subquery_sj_mat.result b/mysql-test/r/subquery_sj_mat.result index ae690001f15..b6bd0ce22b2 100644 --- a/mysql-test/r/subquery_sj_mat.result +++ b/mysql-test/r/subquery_sj_mat.result @@ -1,7 +1,3 @@ -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch='semijoin=on,materialization=on'; set @old_opt_switch=@@optimizer_switch; set optimizer_switch='subquery_materialization_cost_based=off'; @@ -13844,5 +13840,3 @@ f1 f2 14:51:13 S DROP TABLE t1, t2; set optimizer_switch=default; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. diff --git a/mysql-test/r/subquery_sj_mat_bka.result b/mysql-test/r/subquery_sj_mat_bka.result index 4b13e24edbd..a088f33597e 100644 --- a/mysql-test/r/subquery_sj_mat_bka.result +++ b/mysql-test/r/subquery_sj_mat_bka.result @@ -1,8 +1,4 @@ set optimizer_switch='batched_key_access=on,mrr_cost_based=off'; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch='semijoin=on,materialization=on'; set @old_opt_switch=@@optimizer_switch; set optimizer_switch='subquery_materialization_cost_based=off'; @@ -13845,6 +13841,4 @@ f1 f2 14:51:13 S DROP TABLE t1, t2; set optimizer_switch=default; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch=default; diff --git a/mysql-test/r/subquery_sj_mat_bka_nobnl.result b/mysql-test/r/subquery_sj_mat_bka_nobnl.result index cee1779f4aa..7378907ce8a 100644 --- a/mysql-test/r/subquery_sj_mat_bka_nobnl.result +++ b/mysql-test/r/subquery_sj_mat_bka_nobnl.result @@ -1,8 +1,4 @@ set optimizer_switch='batched_key_access=on,block_nested_loop=off,mrr_cost_based=off'; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch='semijoin=on,materialization=on'; set @old_opt_switch=@@optimizer_switch; set optimizer_switch='subquery_materialization_cost_based=off'; @@ -13836,6 +13832,4 @@ f1 f2 14:51:13 S DROP TABLE t1, t2; set optimizer_switch=default; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. set optimizer_switch=default; diff --git a/mysql-test/suite/innodb/r/select_count_perf.result b/mysql-test/suite/innodb/r/select_count_perf.result index 2b2adfab646..e7d163d57f3 100644 --- a/mysql-test/suite/innodb/r/select_count_perf.result +++ b/mysql-test/suite/innodb/r/select_count_perf.result @@ -4,10 +4,6 @@ # by count(*) always reflects the correct view of the table according # to the transaction's selected isolation level. # -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. # # Traverse various indexes to get the right counts. # This especially tests count(*) which is pushed down to InnoDB in WL#6742. @@ -1895,5 +1891,3 @@ id select_type table partitions type possible_keys key key_len ref rows filtered Warnings: Note 1003 /* select#1 */ select count(0) AS `COUNT(*)` from `test`.`t1` FORCE INDEX (`c2_idx`) join `test`.`t2` DROP TABLE t1, t2; -Warnings: -Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release. diff --git a/mysql-test/suite/innodb/t/select_count_perf.test b/mysql-test/suite/innodb/t/select_count_perf.test index e5070f14d11..6a3bfeff159 100644 --- a/mysql-test/suite/innodb/t/select_count_perf.test +++ b/mysql-test/suite/innodb/t/select_count_perf.test @@ -14,8 +14,11 @@ if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) { --disable_query_log + # Avoid warnings since binlog_format is deprecated + --disable_warnings SET @saved_binlog_format= @@SESSION.binlog_format; SET SESSION binlog_format= MIXED; + --enable_warnings --enable_query_log } @@ -401,6 +404,8 @@ DROP TABLE t1, t2; if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) { --disable_query_log + --disable_warnings SET SESSION binlog_format= @saved_binlog_format; + --enable_warnings --enable_query_log } diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index 1c1153ab5b4..8b95bfd8394 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -10,8 +10,11 @@ if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) { --disable_query_log + # Avoid warnings since binlog_format is deprecated + --disable_warnings SET @saved_binlog_format= @@SESSION.binlog_format; SET SESSION binlog_format= MIXED; + --enable_warnings --enable_query_log } @@ -877,7 +880,9 @@ DROP DATABASE meow; if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) { --disable_query_log + --disable_warnings SET SESSION binlog_format= @saved_binlog_format; + --enable_warnings --enable_query_log } diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test index 02513076118..584b54fe1e4 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -4,8 +4,11 @@ if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) { --disable_query_log + # Avoid warnings since binlog_format is deprecated + --disable_warnings SET @saved_binlog_format= @@SESSION.binlog_format; SET SESSION binlog_format= STATEMENT; + --enable_warnings --enable_query_log } @@ -282,7 +285,9 @@ eval INSTALL PLUGIN example SONAME '$path'; if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) { --disable_query_log + --disable_warnings SET SESSION binlog_format= @saved_binlog_format; + --enable_warnings --enable_query_log } diff --git a/mysql-test/t/subquery_sj_all.test b/mysql-test/t/subquery_sj_all.test index 40a9aa72d51..eab49fc2ce7 100644 --- a/mysql-test/t/subquery_sj_all.test +++ b/mysql-test/t/subquery_sj_all.test @@ -3,16 +3,6 @@ # unsafe system function like rand(), LIMIT clause. --source include/not_binlog_format_statement.inc -# The test fails with log_bin ON and binlog_format=ROW due to Bug#22841208. -# Temporarily, overriding binlog_format to MIXED when log_bin is ON. -if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) -{ - --disable_query_log - SET @saved_binlog_format= @@SESSION.binlog_format; - SET SESSION binlog_format= MIXED; - --enable_query_log -} - # # Run subquery_sj.inc with all of the so-called 6.0 features. # @@ -22,10 +12,3 @@ set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on, --source include/subquery_sj.inc set optimizer_switch=default; - -if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) -{ - --disable_query_log - SET SESSION binlog_format= @saved_binlog_format; - --enable_query_log -} diff --git a/mysql-test/t/subquery_sj_mat.test b/mysql-test/t/subquery_sj_mat.test index 92d97349840..ff212e3aaab 100644 --- a/mysql-test/t/subquery_sj_mat.test +++ b/mysql-test/t/subquery_sj_mat.test @@ -3,16 +3,6 @@ # unsafe system function like rand(), LIMIT clause. --source include/not_binlog_format_statement.inc -# The test fails with log_bin ON and binlog_format=ROW due to Bug#22841208. -# Temporarily, overriding binlog_format to MIXED when log_bin is ON. -if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) -{ - --disable_query_log - SET @saved_binlog_format= @@SESSION.binlog_format; - SET SESSION binlog_format= MIXED; - --enable_query_log -} - # # Run subquery_sj.inc with semijoin and turn off all strategies, but Materialization # @@ -45,10 +35,3 @@ if (`select locate('mrr', @@optimizer_switch) > 0`) --source include/subquery_sj.inc set optimizer_switch=default; - -if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`) -{ - --disable_query_log - SET SESSION binlog_format= @saved_binlog_format; - --enable_query_log -}