Merge branch '10.0' into 10.1

2e3a16e3 · Sergei Golubchik · bb7a70c9 · 8d0448d5 · bb7a70c9 · 2e3a16e3
Commit 2e3a16e3 authored Sep 21, 2017 by Sergei Golubchik
87 changed files
--- a/cmake/CMakeLis.txt
+++ b/cmake/CMakeLis.txt
--- a/mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc
+++ b/mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc
@@ -18,8 +18,8 @@
 # and replication is started from it.
 #
--source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 --connection slave
 # Make sure the slave is stopped while we are messing with master.

--- a/mysql-test/extra/rpl_tests/rpl_checksum.inc
+++ b/mysql-test/extra/rpl_tests/rpl_checksum.inc
@@ -7,9 +7,9 @@
 # WL2540 replication events checksum
 # Testing configuration parameters
--source include/master-slave.inc
 --source include/have_debug.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log');
 call mtr.add_suppression('Replication event checksum verification failed');

--- a/mysql-test/extra/rpl_tests/rpl_incident.inc
+++ b/mysql-test/extra/rpl_tests/rpl_incident.inc
@@ -4,8 +4,8 @@
 # Please check all dependent tests after modifying it
 #
--source include/master-slave.inc
 --source include/have_debug.inc
+--source include/master-slave.inc
 --echo **** On Master ****
 CREATE TABLE t1 (a INT);

--- a/mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc
+++ b/mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc
@@ -35,8 +35,8 @@
 #                    Configuring the Environment
 ######################################################################
 source include/have_debug.inc;
-source include/master-slave.inc;
 source include/have_log_bin.inc;
+source include/master-slave.inc;
 connection slave;

--- a/mysql-test/extra/rpl_tests/rpl_loaddata.test
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test
@@ -11,8 +11,8 @@
 # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986)
-- source include/master-slave.inc
 source include/have_innodb.inc;
+source include/master-slave.inc;
 --disable_query_log
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/extra/rpl_tests/rpl_packet.inc
+++ b/mysql-test/extra/rpl_tests/rpl_packet.inc
@@ -15,8 +15,9 @@
 # BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKET
 # max-out size db name 
-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
 call mtr.add_suppression("Slave I/O: Got a packet bigger than 'slave_max_allowed_packet' bytes, .*error.* 1153");
 call mtr.add_suppression("Log entry on master is longer than slave_max_allowed_packet");
 let $db= DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________;

--- a/mysql-test/extra/rpl_tests/rpl_skip_replication.inc
+++ b/mysql-test/extra/rpl_tests/rpl_skip_replication.inc
@@ -16,8 +16,8 @@
 # so if it is needed, it should be set explicitly before each call.
 #
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 connection slave;
 # Test that SUPER is required to change @@replicate_events_marked_for_skip.

--- a/mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc
+++ b/mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc
@@ -25,8 +25,8 @@
 # IO thread does not do it in an uncontrolled manner.
 --source include/have_binlog_format_statement.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --disable_query_log
 CREATE TABLE t1 (c1 TEXT) engine=InnoDB;

--- a/mysql-test/extra/rpl_tests/rpl_sync.inc
+++ b/mysql-test/extra/rpl_tests/rpl_sync.inc
@@ -32,12 +32,12 @@
 #                                Configuring the environment
 ########################################################################################
 --echo =====Configuring the enviroment=======;
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_valgrind.inc
 --source include/have_debug.inc
 --source include/have_innodb.inc
 --source include/not_crashrep.inc
+--source include/master-slave.inc
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");

--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -745,3 +745,9 @@ f1	f2
 drop view v1;
 drop table t1;
 SET @@sql_mode= @save_mode;
+CREATE TABLE t1 (f INT);
+CREATE VIEW v1 AS SELECT * FROM t1 WHERE f <=> 'foo' WITH CHECK OPTION;
+REPLACE INTO v1 SET f = NULL;
+ERROR HY000: CHECK OPTION failed 'test.v1'
+DROP VIEW v1;
+DROP TABLE t1;
--- a/mysql-test/suite/engines/funcs/t/rpl_insert.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_insert.test
@@ -2,9 +2,9 @@
 --echo # Bug#20821: INSERT DELAYED fails to write some rows to binlog
 --echo #
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
+--source include/master-slave.inc
 --disable_warnings
 CREATE SCHEMA IF NOT EXISTS mysqlslap;

--- a/mysql-test/suite/innodb/t/innodb-index-online.test
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test
 --source include/innodb_page_size_small.inc
 --source include/innodb_encrypt_log.inc
+--source include/have_debug.inc
 --source include/have_debug_sync.inc
 let $innodb_metrics_select=

--- a/mysql-test/suite/parts/t/rpl_partition.test
+++ b/mysql-test/suite/parts/t/rpl_partition.test
 --source include/have_partition.inc
 --source include/have_innodb.inc
--source include/master-slave.inc
 --source include/big_test.inc
+--source include/master-slave.inc
 --vertical_results

--- a/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.test
+++ b/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.test
--source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 --enable_connect_log

--- a/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test
+++ b/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 --enable_connect_log
 --connection master

--- a/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
+++ b/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
@@ -5,9 +5,9 @@
 # is replication unsafe.
 #
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
 source include/have_innodb.inc;
+source include/master-slave.inc;
 call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');

--- a/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
+++ b/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
-source include/master-slave.inc;
 source include/have_innodb.inc;
 source include/have_binlog_format_statement.inc;
+source include/master-slave.inc;
 connection slave;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_blackhole.test
+++ b/mysql-test/suite/rpl/t/rpl_blackhole.test
@@ -15,8 +15,8 @@
 # primary key lookup), and index/key with multiple matches (forcing an
 # index search).
-source include/master-slave.inc;
 source include/have_blackhole.inc;
+source include/master-slave.inc;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_concurrency_error.test
+++ b/mysql-test/suite/rpl/t/rpl_concurrency_error.test
@@ -17,9 +17,9 @@
 # log, the error is ignored and only the non-transactional tables are changed.
 ###############################################################################
--source include/master-slave.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_conditional_comments.test
+++ b/mysql-test/suite/rpl/t/rpl_conditional_comments.test
@@ -8,8 +8,8 @@
 #  will be binlogged as 
 #  'INSERT INTO t1 VALUES (1) /*!10000, (2)*/ /* 99999 ,(3)*/'.
 ###############################################################################
-source include/master-slave.inc;
 source include/have_binlog_format_statement.inc;
+source include/master-slave.inc;
 CREATE TABLE t1(c1 INT);
 source include/show_binlog_events.inc;

--- a/mysql-test/suite/rpl/t/rpl_empty_master_host.test
+++ b/mysql-test/suite/rpl/t/rpl_empty_master_host.test
@@ -16,8 +16,8 @@
 #   along the way if error/no error is thrown and/or if replication starts
 #   working when expected.
--source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 connection slave;
 STOP SLAVE;

--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
@@ -2,8 +2,8 @@
 # Purpose: To test having extra columns on the master WL#3915
 #############################################################
 -- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 let $engine_type = 'InnoDB';
 --source extra/rpl_tests/rpl_extra_col_master.test

--- a/mysql-test/suite/rpl/t/rpl_flush_logs.test
+++ b/mysql-test/suite/rpl/t/rpl_flush_logs.test
@@ -4,8 +4,8 @@
 # works fine.  
 #
--source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 connection master;
 # Test 'flush error logs' statement.

--- a/mysql-test/suite/rpl/t/rpl_geometry.test
+++ b/mysql-test/suite/rpl/t/rpl_geometry.test
-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
 #
 # Bug#48776, Bug#43784

--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
@@ -8,9 +8,9 @@
 # Finish the following tests by calling its common test script:  
 # extra/rpl_tests/rpl_get_master_version_and_clock.test. 
-source include/master-slave.inc;
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
+source include/master-slave.inc;
 #
 # The test is not supposed to have any binglog affairs.

--- a/mysql-test/suite/rpl/t/rpl_grant.test
+++ b/mysql-test/suite/rpl/t/rpl_grant.test
 # Tests of grants and users
-source include/master-slave.inc;
 source include/not_embedded.inc;
+source include/master-slave.inc;
 --echo **** On Master ****
 connection master;

--- a/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test
--source include/master-slave.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/master-slave.inc
 CREATE TABLE t1 (i int) ENGINE=InnoDB;

--- a/mysql-test/suite/rpl/t/rpl_heartbeat_debug.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_debug.test
 # Testing master to slave heartbeat protocol, test cases that need debug build.
--source include/master-slave.inc
 --source include/have_debug.inc
+--source include/master-slave.inc
 connection slave;
 --source include/stop_slave.inc

--- a/mysql-test/suite/rpl/t/rpl_innodb_bug68220.test
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug68220.test
 --source include/have_innodb.inc
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 #
 # Bug#68220: innodb_rows_updated is misleading on slave when *info_repository=TABLE

--- a/mysql-test/suite/rpl/t/rpl_insert.test
+++ b/mysql-test/suite/rpl/t/rpl_insert.test
@@ -2,9 +2,9 @@
 --echo # Bug#20821: INSERT DELAYED fails to write some rows to binlog
 --echo #
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
+--source include/master-slave.inc
 disable_query_log;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_invoked_features.test
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features.test
@@ -5,8 +5,8 @@
 #          Features for Replication.
 #########################################
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 disable_query_log;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
@@ -4,8 +4,8 @@
 # if the path of the load data file is a symbolic link.
 #
 --source include/not_windows.inc
--source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 create table t1(a int not null auto_increment, b int, primary key(a) );
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;

--- a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test
+++ b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test
--source include/master-slave.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --source include/have_binlog_format_row.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 connection master;

--- a/mysql-test/suite/rpl/t/rpl_mdev-11092.test
+++ b/mysql-test/suite/rpl/t/rpl_mdev-11092.test
 --source include/have_innodb.inc
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 ########################################################################################
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_mdev8193.test
+++ b/mysql-test/suite/rpl/t/rpl_mdev8193.test
--source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 --connection slave

--- a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
 --source include/have_innodb.inc
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 --source extra/rpl_tests/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
--- a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
@@ -3,8 +3,8 @@
 ################################################################################
 --source include/have_udf.inc
 --source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --let $engine=Innodb
 set session storage_engine=innodb;

--- a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
@@ -3,8 +3,8 @@
 # tables. For further details, please, read WL#2687 and WL#5072.
 ###################################################################################
 --source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 let $engine_type=Innodb;
 let $database_name=test;

--- a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
@@ -3,8 +3,8 @@
 # tables. For further details, please, read WL#2687 and WL#5072.
 ###################################################################################
 --source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --disable_query_log
 SET SESSION binlog_direct_non_transactional_updates = OFF;

--- a/mysql-test/suite/rpl/t/rpl_not_null_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_not_null_innodb.test
@@ -11,9 +11,9 @@
 # 3 - NULL --> NOT NULL ( sql-mode != STRICT and no failures)
 #
 #################################################################################
--source include/master-slave.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 let $engine=Innodb;
 --source extra/rpl_tests/rpl_not_null.test

--- a/mysql-test/suite/rpl/t/rpl_not_null_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_not_null_myisam.test
@@ -11,8 +11,8 @@
 # 3 - NULL --> NOT NULL ( sql-mode != STRICT and no failures)
 #
 #################################################################################
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 let $engine=MyISAM;
 --source extra/rpl_tests/rpl_not_null.test

--- a/mysql-test/suite/rpl/t/rpl_performance_schema.test
+++ b/mysql-test/suite/rpl/t/rpl_performance_schema.test
--source include/master-slave.inc
 --source include/have_perfschema.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 UPDATE performance_schema.setup_instruments SET ENABLED="NO";

--- a/mysql-test/suite/rpl/t/rpl_read_only.test
+++ b/mysql-test/suite/rpl/t/rpl_read_only.test
 # Test case for BUG #11733
-- source include/master-slave.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_report_port.test
+++ b/mysql-test/suite/rpl/t/rpl_report_port.test
@@ -17,8 +17,8 @@
 # case on doing SHOW SLAVE HOSTS on the master, we get the actual port number
 # of the slave (ie. SLAVE_PORT).
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
+source include/master-slave.inc;
 connection master;

--- a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
 --source include/have_innodb.inc
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 --source extra/rpl_tests/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
--- a/mysql-test/suite/rpl/t/rpl_row_colSize.test
+++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test
@@ -6,8 +6,8 @@
 # having columns that are smaller (shorter) than the slave.      #
 ##################################################################
-- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 --disable_warnings
 DROP TABLE IF EXISTS t1;

--- a/mysql-test/suite/rpl/t/rpl_row_corruption.test
+++ b/mysql-test/suite/rpl/t/rpl_row_corruption.test
 #
--source include/master-slave.inc
 --source include/have_debug.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 # BUG#11753004: 44360: REPLICATION FAILED 

--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test
 # Testing table creations for row-based replication.
 --source include/have_binlog_format_row.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 connection slave;
 --source include/have_innodb.inc
 connection master;

--- a/mysql-test/suite/rpl/t/rpl_row_find_row.test
+++ b/mysql-test/suite/rpl/t/rpl_row_find_row.test
@@ -16,8 +16,8 @@
 #   has been fixed.
 # 
-- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 #
 # Case #1: master has key, but slave has not. 

--- a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
@@ -3,8 +3,8 @@
 ################################################################################
 --source include/have_udf.inc
 --source include/have_binlog_format_row.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --let $engine=Innodb
 set session storage_engine=innodb;

--- a/mysql-test/suite/rpl/t/rpl_row_index_choice.test
+++ b/mysql-test/suite/rpl/t/rpl_row_index_choice.test
 --source include/have_binlog_format_row.inc
--source include/master-slave.inc
 --source include/have_debug.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 # Bug#58997: Row-based replication breaks on table with only fulltext index: 
 connection master;

--- a/mysql-test/suite/rpl/t/rpl_row_merge_engine.test
+++ b/mysql-test/suite/rpl/t/rpl_row_merge_engine.test
@@ -12,8 +12,8 @@
 # deletes their contents through the merge table. Finally, the slave
 # is synchronized with the master and (after the fix) it won't crash.
 # 
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 --connection master
 CREATE TABLE t1 (a int) ENGINE=MyISAM;

--- a/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
 -- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 #
 # BUG#52868 Wrong handling of NULL value during update, replication out of sync

--- a/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
+++ b/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
@@ -12,8 +12,8 @@
 #   This test issues SHOW [BINLOG|RELAYLOG] EVENTS both on master and slave after 
 #   some statements have been issued.
-- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 -- source extra/rpl_tests/rpl_show_relaylog_events.inc
 --source include/rpl_end.inc
--- a/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
+++ b/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
@@ -26,9 +26,9 @@
 #   with mysqlbinlog reporting that it was unable to succeed in
 #   reading the event.
-- source include/master-slave.inc
 -- source include/have_innodb.inc
 -- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 -- disable_warnings
 DROP TABLE IF EXISTS `t1`;

--- a/mysql-test/suite/rpl/t/rpl_row_trunc_temp.test
+++ b/mysql-test/suite/rpl/t/rpl_row_trunc_temp.test
@@ -6,8 +6,8 @@
 # table was binlogged in RBR.
 #
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 #This statement is not binlogged in RBR.
 CREATE TEMPORARY TABLE t1(c1 INTEGER);

--- a/mysql-test/suite/rpl/t/rpl_row_utf16.test
+++ b/mysql-test/suite/rpl/t/rpl_row_utf16.test
-- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
 -- source include/have_utf16.inc
+-- source include/master-slave.inc
 #
 # BUG#51716: Char column with utf16 character set gives wrong padding on slave

--- a/mysql-test/suite/rpl/t/rpl_row_wide_table.test
+++ b/mysql-test/suite/rpl/t/rpl_row_wide_table.test
@@ -8,8 +8,8 @@
 #            in corrupt binlog 
 ##################################################################
-- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 --disable_warnings
 DROP TABLE IF EXISTS t300;

--- a/mysql-test/suite/rpl/t/rpl_savepoint.test
+++ b/mysql-test/suite/rpl/t/rpl_savepoint.test
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --echo #
 --echo # Bug#50124 Rpl failure on DROP table with concurrent txn/non-txn

--- a/mysql-test/suite/rpl/t/rpl_server_id_ignore.test
+++ b/mysql-test/suite/rpl/t/rpl_server_id_ignore.test
@@ -17,8 +17,8 @@
 #    b. nullifying the list and resuming of taking binlog from the very beginning with
 #       executing events this time
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
+source include/master-slave.inc;
 connection slave;

--- a/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
 -- source include/have_binlog_format_mixed_or_row.inc
-- source include/master-slave.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 -- let $engine= InnoDB
 -- source extra/rpl_tests/rpl_set_null.test

--- a/mysql-test/suite/rpl/t/rpl_skip_error.test
+++ b/mysql-test/suite/rpl/t/rpl_skip_error.test
@@ -23,8 +23,8 @@
 # bug in this test: BUG#30594: rpl.rpl_skip_error is nondeterministic:
 # BUG#39393: slave-skip-errors does not work when using ROW based replication
-source include/master-slave.inc;
 source include/have_innodb.inc;
+source include/master-slave.inc;
 --echo ==== Test Without sql_mode=strict_trans_tables ====

--- a/mysql-test/suite/rpl/t/rpl_skip_incident.test
+++ b/mysql-test/suite/rpl/t/rpl_skip_incident.test
--source include/master-slave.inc
 --source include/have_debug.inc
+--source include/master-slave.inc
 --echo **** On Master ****
 CREATE TABLE t1 (a INT);

--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
@@ -20,9 +20,9 @@
 --source include/have_binlog_format_statement.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_var_link.inc
+--source include/master-slave.inc
 ##########################################################################
 #                            Loading data

--- a/mysql-test/suite/rpl/t/rpl_slave_skip.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_skip.test
@@ -4,8 +4,8 @@
 # test for MIXED mode.
 source include/have_binlog_format_mixed.inc;
-source include/master-slave.inc;
 source include/have_innodb.inc;
+source include/master-slave.inc;
 --echo **** On Slave ****
 connection slave;

--- a/mysql-test/suite/rpl/t/rpl_slow_query_log.test
+++ b/mysql-test/suite/rpl/t/rpl_slow_query_log.test
@@ -25,8 +25,8 @@
 #   Note that due to the sleep() command the insert is written to the binary
 #   log in row format.
-source include/master-slave.inc;
 source include/have_binlog_format_statement.inc;
+source include/master-slave.inc;
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");

--- a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
 --source include/have_innodb.inc
--source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 --source extra/rpl_tests/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
--- a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
@@ -5,8 +5,8 @@
 ###################################################################################
 --source include/big_test.inc
 --source include/have_binlog_format_statement.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --source extra/rpl_tests/rpl_drop_create_temp_table.test
 --source include/rpl_end.inc
--- a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
@@ -3,8 +3,8 @@
 ################################################################################
 --source include/have_udf.inc
 --source include/have_binlog_format_statement.inc
--source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 --let $engine=Innodb
 set session storage_engine=innodb;

--- a/mysql-test/suite/rpl/t/rpl_stm_loadfile.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_loadfile.test
@@ -12,8 +12,8 @@
 ##########
 # Includes
-- source include/master-slave.inc
 -- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
 disable_query_log;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

--- a/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
 ################################################################################
 # Please, check ./extra/rpl_tests/rpl_start_stop_slave.test
 ################################################################################
--source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 # make innodb updates run fast
 --connection slave

--- a/mysql-test/suite/rpl/t/rpl_stm_user_variables.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_user_variables.test
@@ -2,8 +2,8 @@
 # BUG#49562: SBR out of sync when using numeric data types + user variable
 #
-- source include/master-slave.inc
 -- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
 ## Setup user variables for several numeric types, so that we get
 ## coverage on the User_var_log_event different val types

--- a/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
+++ b/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
@@ -9,9 +9,9 @@
 #   4: sync to slave and check the number of temp tables on slave.
 #
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
 source include/have_innodb.inc;
+source include/master-slave.inc;
 --echo ==== Initialize ====

--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test
 source include/have_binlog_format_row.inc;
-source include/master-slave.inc;
 source include/have_innodb.inc;
+source include/master-slave.inc;
 call mtr.add_suppression("Deadlock found");
 call mtr.add_suppression("Can't find record in 't.'");

--- a/mysql-test/suite/rpl/t/sec_behind_master-5114.test
+++ b/mysql-test/suite/rpl/t/sec_behind_master-5114.test
-source include/master-slave.inc;
 source include/have_binlog_format_statement.inc;
+source include/master-slave.inc;
 call mtr.add_suppression("Unsafe statement written to the binary log");

--- a/mysql-test/t/create_or_replace2.test
+++ b/mysql-test/t/create_or_replace2.test
@@ -3,9 +3,9 @@
 #
 --source include/have_debug.inc
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
 --source include/have_xtradb.inc
+--source include/master-slave.inc
 --disable_warnings
 drop table if exists t1;

--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -602,3 +602,13 @@ remove_file $MYSQLD_DATADIR/test/t1.txt;
 drop view v1;
 drop table t1;
 SET @@sql_mode= @save_mode;
+#
+# MDEV-13861 Assertion `0' failed in Protocol::end_statement
+#
+CREATE TABLE t1 (f INT);
+CREATE VIEW v1 AS SELECT * FROM t1 WHERE f <=> 'foo' WITH CHECK OPTION;
+--error ER_VIEW_CHECK_FAILED
+REPLACE INTO v1 SET f = NULL;
+DROP VIEW v1;
+DROP TABLE t1;
--- a/mysql-test/t/stat_tables_repl.test
+++ b/mysql-test/t/stat_tables_repl.test
 --source include/have_stat_tables.inc
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 --echo #
 --echo # Bug mdev-485: unexpected failure with replication of DROP/ALTER table

--- a/sql/log.cc
+++ b/sql/log.cc
@@ -9645,6 +9645,8 @@ binlog_background_thread(void *arg __attribute__((unused)))
    {
      THD_STAGE_INFO(thd, stage_binlog_processing_checkpoint_notify);
      DEBUG_SYNC(thd, "binlog_background_thread_before_mark_xid_done");
+      /* Set the thread start time */
+      thd->set_time();
      /* Grab next pointer first, as mark_xid_done() may free the element. */
      next= queue->next_in_queue;
      mysql_bin_log.mark_xid_done(queue->binlog_id, true);

--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1548,6 +1548,29 @@ class Dummy_error_handler : public Internal_error_handler
 };
+/**
+  Implements the trivial error handler which counts errors as they happen.
+*/
+class Counting_error_handler : public Internal_error_handler
+{
+public:
+  int errors;
+  bool handle_condition(THD *thd,
+                        uint sql_errno,
+                        const char* sqlstate,
+                        Sql_condition::enum_warning_level level,
+                        const char* msg,
+                        Sql_condition ** cond_hdl)
+  {
+    if (level == Sql_condition::WARN_LEVEL_ERROR)
+      errors++;
+    return false;
+  }
+  Counting_error_handler() : errors(0) {}
+};
 /**
  This class is an internal error handler implementation for
  DROP TABLE statements. The thing is that there may be warnings during

--- a/sql/table.cc
+++ b/sql/table.cc
@@ -4715,24 +4715,30 @@ void TABLE_LIST::cleanup_items()
 int TABLE_LIST::view_check_option(THD *thd, bool ignore_failure)
 {
-  if (check_option && check_option->val_int() == 0)
+  if (check_option)
  {
-    TABLE_LIST *main_view= top_table();
+    Counting_error_handler ceh;
-    if (ignore_failure)
+    thd->push_internal_handler(&ceh);
+    bool res= check_option->val_int() == 0;
+    thd->pop_internal_handler();
+    if (ceh.errors)
+      return(VIEW_CHECK_ERROR);
+    if (res)
    {
-      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+      TABLE_LIST *main_view= top_table();
-                          ER_VIEW_CHECK_FAILED,
+      if (ignore_failure)
-                          ER_THD(thd, ER_VIEW_CHECK_FAILED),
+      {
-                          main_view->view_db.str, main_view->view_name.str);
+        push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-      return(VIEW_CHECK_SKIP);
+                            ER_VIEW_CHECK_FAILED,
+                            ER_THD(thd, ER_VIEW_CHECK_FAILED),
+                            main_view->view_db.str, main_view->view_name.str);
+        return(VIEW_CHECK_SKIP);
+      }
+      my_error(ER_VIEW_CHECK_FAILED, MYF(0), main_view->view_db.str,
+               main_view->view_name.str);
+      return(VIEW_CHECK_ERROR);
    }
-    my_error(ER_VIEW_CHECK_FAILED, MYF(0), main_view->view_db.str,
-             main_view->view_name.str);
-    return(VIEW_CHECK_ERROR);
  }
-  /* We check thd->error() because it can be set by conversion problem. */
-  if (thd->is_error())
-    return(VIEW_CHECK_ERROR);
  return(VIEW_CHECK_OK);
 }

--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -247,7 +247,7 @@ ENDIF(CONNECT_WITH_ODBC)
 #
 # JDBC with MongoDB Java Driver included but disabled
 #
-OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON)
+#OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON)
 OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine with JDBC support" ON)
 IF(CONNECT_WITH_JDBC)

--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -5379,10 +5379,10 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
 #endif   // __WIN__
 //int      hdr, mxe;
 	int      port = 0, mxr = 0, rc = 0, mul = 0, lrecl = 0;
+	PCSZ     tabtyp = NULL;
 #if defined(ODBC_SUPPORT)
  POPARM   sop= NULL;
 	PCSZ     ucnc= NULL;
-	PCSZ     tabtyp = NULL;
 	bool     cnc= false;
  int      cto= -1, qto= -1;
 #endif   // ODBC_SUPPORT

--- a/storage/connect/preparse.h
+++ b/storage/connect/preparse.h
@@ -8,7 +8,7 @@
 /***********************************************************************/
 typedef struct _datpar {
  const char *Format;     // Points to format to decode
-  char *Curp;             // Points to current parsing position
+  const char *Curp;       // Points to current parsing position
  char *InFmt;            // Start of input format
  char *OutFmt;           // Start of output format
  int   Index[8];         // Indexes of date values

--- a/storage/connect/tabmysql.h
+++ b/storage/connect/tabmysql.h
@@ -135,7 +135,7 @@ class TDBMYSQL : public TDBEXT {
  int         m_Rc;           // Return code from command
 //int         AftRows;        // The number of affected rows
  int         N;              // The current table index
-  int         Port;           // MySQL port number (0 = default) 
+  unsigned    Port;          // MySQL port number (0 = default)
 //int         Nparm;          // The number of statement parameters
 //int         Quoted;         // The identifier quoting level
  }; // end of class TDBMYSQL

--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
@@ -120,7 +120,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
                   FLD_REM,    FLD_NO,    FLD_CHARSET};
  unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 32, 32};
 	PCSZ         fmt;
-  char        *pn, *tn, *fld, *colname, *chset, v;
+  char        *pn, *tn, *fld, *colname, v; //, *chset;
  int          i, n, ncol = sizeof(buftyp) / sizeof(int);
  int          prec, len, type, scale;
  int          zconv = GetConvSize();
@@ -185,7 +185,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
    colname = (char *)fp->field_name;
    crp->Kdata->SetValue(colname, i);
-    chset = (char *)fp->charset()->name;
+//    chset = (char *)fp->charset()->name;
 //  v = (!strcmp(chset, "binary")) ? 'B' : 0;
 		v = 0;