Merge bb-10.2-ext into 10.3

2017-09-25 22:05:56 +03:00 · 2017-09-25 22:05:56 +03:00 · 4a32e2395e
commit 4a32e2395e
parent b773270c39 86c3ba65aa
140 changed files with 858 additions and 323 deletions
--- a/.gitignore
+++ b/.gitignore
@ -69,6 +69,7 @@ include/sql_state.h
 include/probes_mysql.d
 include/probes_mysql_dtrace.h
 include/probes_mysql_nodtrace.h
+include/source_revision.h
 info_macros.cmake
 libmysql*/libmysql*_exports_file.cc
 libmysql*/merge_archives_mysql*.cmake
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -115,12 +115,14 @@ FOREACH(_base
  ENDIF()
 ENDFOREACH()

-FOREACH(tool gtar tar git)
+FOREACH(tool gtar tar)
 STRING(TOUPPER ${tool}  TOOL)
 FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
 MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
 ENDFOREACH()

+FIND_PACKAGE(Git)
+
 # Following autotools tradition, add preprocessor definitions
 # specified in environment variable CPPFLAGS
 IF(DEFINED ENV{CPPFLAGS})
@ -443,7 +445,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
    ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)

-FIND_PACKAGE(Git)
 IF(GIT_EXECUTABLE)
  EXECUTE_PROCESS(
    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
--- a/README.md
+++ b/README.md
@ -17,7 +17,7 @@ see the Credits appendix.  You can also run 'SHOW authors' to get a
 list of active contributors.

 A description of the MariaDB project and a manual can be found at:
-http://mariadb.org/
+https://mariadb.org/
 https://mariadb.com/kb/en/
 https://mariadb.com/kb/en/mariadb-vs-mysql-features/
 https://mariadb.com/kb/en/mariadb-versus-mysql-features/
@ -55,9 +55,9 @@ Bug Reports:
 ------------

 Bug and/or error reports regarding MariaDB should be submitted at
-http://mariadb.org/jira
+https://mariadb.org/jira

-Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
+Bugs in the MySQL code can also be submitted at https://bugs.mysql.com

 The code for MariaDB, including all revision history, can be found at:
 https://github.com/MariaDB/server
--- a/cmake/CMakeLis.txt
+++ b/cmake/CMakeLis.txt
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@ -13,11 +13,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA

-INCLUDE(FindPkgConfig)
-# http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html
-
 MACRO(CHECK_SYSTEMD)
  IF(UNIX)
+    INCLUDE(FindPkgConfig)
+    # http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html
    SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support")
    IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto")
      IF(PKG_CONFIG_FOUND)
--- 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_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/explain_json.result
+++ b/mysql-test/r/explain_json.result
@ -1525,12 +1525,12 @@ ANALYZE
        "key_length": "5",
        "used_key_parts": ["a"],
        "ref": ["test.t3.a"],
-        "r_loops": 0,
+        "r_loops": 1,
        "rows": 1,
-        "r_rows": null,
+        "r_rows": 10,
        "r_total_time_ms": "REPLACED",
        "filtered": 100,
-        "r_filtered": null,
+        "r_filtered": 100,
        "index_condition_bka": "t4.b + 1 <= t3.b + 1"
      },
      "buffer_type": "flat",
--- 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 22007: Truncated incorrect DOUBLE value: 'foo'
+DROP VIEW v1;
+DROP TABLE t1;
--- a/mysql-test/r/locale.result
+++ b/mysql-test/r/locale.result
@ -229,15 +229,80 @@ SET lc_time_names=@old_50915_lc_time_names;
 # End of 10.1 tests
 #
 create view v1 as select
+date_format('2001-10-02', '%c %b %M') as a,
+date_format('2001-10-02', '%c %b %M', 'ru_RU') as a1,
 format(123456789,2) as b,
 format(123456789,2,'rm_CH') as b1;
 select * from v1;
-b	b1
-123,456,789.00	123'456'789,00
+a	a1	b	b1
+10 Oct October	10 Окт Октября	123,456,789.00	123'456'789,00
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1`	utf8	utf8_general_ci
 drop view v1;
 #
 # End of 10.2 tests
 #
+select date_format('2001-01-01', '%w %a %W', 'ro_RO');
+date_format('2001-01-01', '%w %a %W', 'ro_RO')
+1 Lu Luni
+select date_format('2001-01-03', '%w %a %W', 'ro_RO');
+date_format('2001-01-03', '%w %a %W', 'ro_RO')
+3 Mi Miercuri
+select date_format('2001-01-05', '%w %a %W', 'ro_RO');
+date_format('2001-01-05', '%w %a %W', 'ro_RO')
+5 Vi Vineri
+select date_format('2001-01-07', '%w %a %W', 'ro_RO');
+date_format('2001-01-07', '%w %a %W', 'ro_RO')
+0 Du Duminică
+select date_format('2001-01-01', '%w %a %W', 'de_AT');
+date_format('2001-01-01', '%w %a %W', 'de_AT')
+1 Mon Montag
+select date_format('2001-02-01', '%w %a %W', 'de_AT');
+date_format('2001-02-01', '%w %a %W', 'de_AT')
+4 Don Donnerstag
+select date_format('2001-03-01', '%w %a %W', 'de_AT');
+date_format('2001-03-01', '%w %a %W', 'de_AT')
+4 Don Donnerstag
+select date_format('2001-01-01', '%w %a %W', 'en_US');
+date_format('2001-01-01', '%w %a %W', 'en_US')
+1 Mon Monday
+select date_format('2001-03-01', '%c %b %M', 'en_US');
+date_format('2001-03-01', '%c %b %M', 'en_US')
+3 Mar March
+select date_format('2001-01-01', '%w %a %W', 'rm_CH');
+date_format('2001-01-01', '%w %a %W', 'rm_CH')
+1 gli glindesdi
+select date_format('2001-01-03', '%w %a %W', 'rm_CH');
+date_format('2001-01-03', '%w %a %W', 'rm_CH')
+3 me mesemna
+select date_format('2001-01-05', '%w %a %W', 'rm_CH');
+date_format('2001-01-05', '%w %a %W', 'rm_CH')
+5 ve venderdi
+select date_format('2001-01-07', '%w %a %W', 'rm_CH');
+date_format('2001-01-07', '%w %a %W', 'rm_CH')
+0 du dumengia
+select date_format('2001-02-01', '%c %b %M', 'rm_CH');
+date_format('2001-02-01', '%c %b %M', 'rm_CH')
+2 favr favrer
+select date_format('2001-04-01', '%c %b %M', 'rm_CH');
+date_format('2001-04-01', '%c %b %M', 'rm_CH')
+4 avr avrigl
+select date_format('2001-06-01', '%c %b %M', 'rm_CH');
+date_format('2001-06-01', '%c %b %M', 'rm_CH')
+6 zercl zercladur
+select date_format('2001-08-01', '%c %b %M', 'rm_CH');
+date_format('2001-08-01', '%c %b %M', 'rm_CH')
+8 avust avust
+select date_format('2001-10-01', '%c %b %M', 'rm_CH');
+date_format('2001-10-01', '%c %b %M', 'rm_CH')
+10 oct october
+select date_format('2001-12-01', '%c %b %M', 'rm_CH');
+date_format('2001-12-01', '%c %b %M', 'rm_CH')
+12 dec december
+select date_format('2001-01-06', '%w %a %W', 'de_CH');
+date_format('2001-01-06', '%w %a %W', 'de_CH')
+6 Sa Samstag
+select date_format('2001-09-01', '%c %b %M', 'de_CH');
+date_format('2001-09-01', '%c %b %M', 'de_CH')
+9 Sep September
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@ -2569,6 +2569,14 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 DROP TABLE t1;
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b)) engine=myisam;
+INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
+(6,'0'),(7,'0');
+flush tables test.t1 for export;
+insert into t1 values (8,'0');
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+unlock tables;
+drop table t1;
 show variables like 'myisam_block_size';
 Variable_name	Value
 myisam_block_size	1024
--- a/mysql-test/r/old-mode.result
+++ b/mysql-test/r/old-mode.result
@ -127,3 +127,56 @@ Warning	1264	Out of range value for column 'a' at row 1
 Warning	1264	Out of range value for column 'b' at row 1
 DROP TABLE t1;
 SET @@global.mysql56_temporal_format=DEFAULT;
+set time_zone='Europe/Moscow';
+set global mysql56_temporal_format=false;
+create table t1 (a timestamp);
+set timestamp=1288477526;
+insert t1 values (null);
+insert t1 values ();
+set timestamp=1288481126;
+insert t1 values (null);
+insert t1 values ();
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+2010-10-31 02:25:26	1288481126
+set global mysql56_temporal_format=true;
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+2010-10-31 02:25:26	1288481126
+alter table t1 modify a timestamp;
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+2010-10-31 02:25:26	1288481126
+drop table t1;
+set global mysql56_temporal_format=false;
+create table t1 (a timestamp);
+set timestamp=1288477526;
+insert t1 values (null);
+set timestamp=1288481126;
+insert t1 values (null);
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+set global mysql56_temporal_format=true;
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+create table t2 (a timestamp);
+insert t2 select a from t1;
+select a, unix_timestamp(a) from t2;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+drop table t1, t2;
+set time_zone=DEFAULT;
--- 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/r/innodb-table-online.result
+++ b/mysql-test/suite/innodb/r/innodb-table-online.result
@ -167,7 +167,8 @@ ROLLBACK;
 connection con1;
 KILL QUERY @id;
 ERROR 70100: Query execution was interrupted
-SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
+SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 # session default
 connection default;
@ -180,6 +181,10 @@ ddl_online_create_index	1
 ddl_pending_alter_table	1
 ddl_sort_file_alter_table	0
 ddl_log_file_alter_table	0
+BEGIN;
+INSERT INTO t1 VALUES(7,4,2);
+ROLLBACK;
+SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
 KILL QUERY @id;
 SET DEBUG_SYNC = 'now SIGNAL kill_done';
 # session con1
@ -227,6 +232,7 @@ t1	CREATE TABLE `t1` (
  `c3` char(255) NOT NULL,
  PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done';
 SET lock_wait_timeout = 10;
 ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE;
--- a/mysql-test/suite/innodb/r/truncate_debug.result
+++ b/mysql-test/suite/innodb/r/truncate_debug.result
@ -1,6 +1,9 @@
 #
 # Bug #23070734	CONCURRENT TRUNCATE TABLES CAUSE STALLS
 #
+SET @ahi= @@global.innodb_adaptive_hash_index;
+SET GLOBAL innodb_adaptive_hash_index=OFF;
+SET GLOBAL innodb_adaptive_hash_index=ON;
 Test_1 :- Check if DDL operations are possible on
 table being truncated. Also check if
 DDL operations on other tables succeed.
@ -81,6 +84,5 @@ connection con2;
 disconnect con2;
 connection default;
 SET DEBUG_SYNC= 'RESET';
-SET session lock_wait_timeout=default;
-set global innodb_adaptive_hash_index=on;
+SET GLOBAL innodb_adaptive_hash_index=@ahi;
 drop table t1,t2,t3;
--- a/mysql-test/suite/innodb/t/innodb-index-online.test
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test
@ -1,5 +1,6 @@
 --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/innodb/t/innodb-table-online.test
+++ b/mysql-test/suite/innodb/t/innodb-table-online.test
@ -158,7 +158,8 @@ let $ID= `SELECT @id := CONNECTION_ID()`;
 --error ER_QUERY_INTERRUPTED
 KILL QUERY @id;

-SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
+SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
 --send
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;

@ -166,6 +167,10 @@ ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 connection default;
 SET DEBUG_SYNC = 'now WAIT_FOR rebuilt';
 eval $innodb_metrics_select;
+BEGIN;
+INSERT INTO t1 VALUES(7,4,2);
+ROLLBACK;
+SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
 let $ignore= `SELECT @id := $ID`;
 KILL QUERY @id;
 SET DEBUG_SYNC = 'now SIGNAL kill_done';
@ -201,6 +206,7 @@ WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
 --echo # session con1
 connection con1;
 SHOW CREATE TABLE t1;
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;

 # Exceed the configured innodb_online_alter_log_max_size.
 # The actual limit is a multiple of innodb_sort_buf_size,
--- a/mysql-test/suite/innodb/t/truncate_debug.test
+++ b/mysql-test/suite/innodb/t/truncate_debug.test
@ -8,6 +8,12 @@
 --echo # Bug #23070734	CONCURRENT TRUNCATE TABLES CAUSE STALLS
 --echo #

+SET @ahi= @@global.innodb_adaptive_hash_index;
+# Ensure that there is no adaptive hash index on any system tables,
+# or any other tables than the ones that we are creating below.
+SET GLOBAL innodb_adaptive_hash_index=OFF;
+SET GLOBAL innodb_adaptive_hash_index=ON;
+
 --echo Test_1 :- Check if DDL operations are possible on
 --echo		 table being truncated. Also check if
 --echo		 DDL operations on other tables succeed.
@ -115,8 +121,7 @@ disconnect con2;
 connection default;
 SET DEBUG_SYNC= 'RESET';

-SET session lock_wait_timeout=default;
-set global innodb_adaptive_hash_index=on;
+SET GLOBAL innodb_adaptive_hash_index=@ahi;

 drop table t1,t2,t3;
 --source include/wait_until_count_sessions.inc
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@ -2790,3 +2790,11 @@ test.t1	check	status	OK
 SET aria_repair_threads=@@global.aria_repair_threads;
 SET aria_sort_buffer_size=@@global.aria_sort_buffer_size;
 DROP TABLE t1;
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b));
+INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
+(6,'0'),(7,'0');
+flush tables test.t1 for export;
+insert into t1 values (8,'0');
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+unlock tables;
+drop table t1;
--- a/mysql-test/suite/maria/maria.test
+++ b/mysql-test/suite/maria/maria.test
@ -2018,6 +2018,19 @@ SET aria_repair_threads=@@global.aria_repair_threads;
 SET aria_sort_buffer_size=@@global.aria_sort_buffer_size;
 DROP TABLE t1;

+#
+# Check FLUSH FOR EXPORT
+#
+
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b));
+INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
+                     (6,'0'),(7,'0');
+flush tables test.t1 for export;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+insert into t1 values (8,'0');
+unlock tables;
+drop table t1;
+
 #
 # End of test
 #
--- a/mysql-test/suite/parts/t/rpl_partition.test
+++ b/mysql-test/suite/parts/t/rpl_partition.test
@ -1,7 +1,7 @@
 --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
@ -1,5 +1,5 @@
--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/r/rpl_temporal_format_mariadb53_to_mysql56_dst.result
+++ b/mysql-test/suite/rpl/r/rpl_temporal_format_mariadb53_to_mysql56_dst.result
@ -0,0 +1,32 @@
+include/master-slave.inc
+[connection master]
+connection slave;
+set global time_zone='Europe/Moscow';
+set time_zone='UTC';
+stop slave;
+start slave;
+connection master;
+set global mysql56_temporal_format=false;
+set global time_zone='Europe/Moscow';
+set time_zone='UTC';
+create table t1 (pk int primary key, t timestamp not null);
+set timestamp = 1288477526;
+insert into t1 values (1,null);
+set timestamp = 1288481126;
+insert into t1 values (2,null);
+connection slave;
+select pk, t, unix_timestamp(t) from t1;
+pk	t	unix_timestamp(t)
+1	2010-10-30 22:25:26	1288477526
+2	2010-10-30 23:25:26	1288481126
+set time_zone=default;
+select pk, t, unix_timestamp(t) from t1;
+pk	t	unix_timestamp(t)
+1	2010-10-31 02:25:26	1288477526
+2	2010-10-31 02:25:26	1288481126
+set global time_zone=default;
+connection master;
+drop table t1;
+set global time_zone=default;
+set global mysql56_temporal_format=default;
+include/rpl_end.inc
--- a/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test
+++ b/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test
@ -1,5 +1,5 @@
--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
@ -1,6 +1,6 @@
-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
@ -1,5 +1,5 @@
-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
@ -1,7 +1,7 @@
 # Tests of grants and users

-source include/master-slave.inc;
 source include/not_embedded.inc;
+source include/master-slave.inc;

 connection master;

--- a/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test
@ -1,6 +1,6 @@
--source include/master-slave.inc
 --source include/have_innodb.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_heartbeat_debug.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_debug.test
@ -1,7 +1,7 @@
 # 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
@ -1,6 +1,6 @@
 --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
@ -1,8 +1,8 @@
--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
@ -1,8 +1,8 @@
 --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
@ -1,5 +1,5 @@
--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
@ -1,8 +1,8 @@
 --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
@ -1,6 +1,6 @@
--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
@ -1,6 +1,6 @@
 # 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
@ -1,8 +1,8 @@
 --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
@ -1,7 +1,7 @@
 #
--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
@ -1,8 +1,8 @@
 # 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
@ -1,7 +1,7 @@
 --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
@ -1,6 +1,6 @@
 -- 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
@ -1,6 +1,6 @@
-- 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
@ -1,5 +1,5 @@
--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
@ -1,6 +1,6 @@
 -- 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
@ -1,5 +1,5 @@
--source include/master-slave.inc
 --source include/have_debug.inc
+--source include/master-slave.inc

 connection master;
 SET GLOBAL BINLOG_CHECKSUM=NONE;
--- 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;

 connection slave;
 source include/have_innodb.inc;
--- 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
@ -1,8 +1,8 @@
 --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
@ -1,9 +1,9 @@
 ################################################################################
 # 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_temporal_format_mariadb53_to_mysql56_dst.test
+++ b/mysql-test/suite/rpl/t/rpl_temporal_format_mariadb53_to_mysql56_dst.test
@ -0,0 +1,37 @@
+#
+# MDEV-12672 Replicated TIMESTAMP fields given wrong value near DST change
+#
+source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
+
+connection slave;
+set global time_zone='Europe/Moscow';
+set time_zone='UTC';
+stop slave;
+start slave;
+
+connection master;
+set global mysql56_temporal_format=false;
+set global time_zone='Europe/Moscow';
+set time_zone='UTC';
+
+create table t1 (pk int primary key, t timestamp not null);
+set timestamp = 1288477526;
+insert into t1 values (1,null);
+set timestamp = 1288481126;
+insert into t1 values (2,null);
+
+sync_slave_with_master;
+
+select pk, t, unix_timestamp(t) from t1;
+set time_zone=default;
+select pk, t, unix_timestamp(t) from t1;
+
+set global time_zone=default;
+
+connection master;
+drop table t1;
+set global time_zone=default;
+set global mysql56_temporal_format=default;
+
+source include/rpl_end.inc;
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test
@ -1,6 +1,6 @@
 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
@ -1,5 +1,5 @@
-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/suite/vcol/r/vcol_blocked_sql_funcs.result
+++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
@ -247,3 +247,5 @@ ERROR HY000: Expression in the GENERATED ALWAYS AS clause is too big
 # Constant expression
 create or replace table t1 (a int as (PI()) PERSISTENT);
 drop table if exists t1;
+create table t1 (a timestamp, b varchar(255) as (date_format(a, '%w %a %m %b')) stored);
+ERROR HY000: Function or expression 'date_format()' cannot be used in the GENERATED ALWAYS AS clause of `b`
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result
@ -2894,6 +2894,21 @@ a	b
 2012-12-12	Wednesday Wed December Dec
 drop table t1;
 set sql_warnings = 0;
+# DATE_FORMAT() STORED
+set sql_warnings = 1;
+create table t1 (a date, b varchar(100) as (date_format(a, '%W %a %M %b', 'de_DE')) STORED);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` date DEFAULT NULL,
+  `b` varchar(100) GENERATED ALWAYS AS (date_format(`a`,'%W %a %M %b','de_DE')) STORED
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ('2012-12-12',default);
+select * from t1;
+a	b
+2012-12-12	Mittwoch Mi Dezember Dez
+drop table t1;
+set sql_warnings = 0;
 # CURRENT_USER()
 set sql_warnings = 1;
 create table t1 (a char, b varchar(32) as (current_user()));
--- a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc
+++ b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc
@ -354,3 +354,6 @@ eval create or replace table t1 (a int, b varchar(16384) as (concat(a,'$tmp_long
 create or replace table t1 (a int as (PI()) PERSISTENT);

 drop table if exists t1;
+
+--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+create table t1 (a timestamp, b varchar(255) as (date_format(a, '%w %a %m %b')) stored);
--- a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc
@ -1197,6 +1197,12 @@ let $values1 = '2012-12-12',default;
 let $rows = 1;
 --source suite/vcol/inc/vcol_supported_sql_funcs.inc

+--echo # DATE_FORMAT() STORED
+let $cols = a date, b varchar(100) as (date_format(a, '%W %a %M %b', 'de_DE')) STORED;
+let $values1 = '2012-12-12',default;
+let $rows = 1;
+--source suite/vcol/inc/vcol_supported_sql_funcs.inc
+
 --echo # CURRENT_USER()
 let $cols = a char, b varchar(32) as (current_user());
 let $values1 = 'a', default;
--- 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_innodb.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_TRUNCATED_WRONG_VALUE
+REPLACE INTO v1 SET f = NULL;
+DROP VIEW v1;
+DROP TABLE t1;
--- a/mysql-test/t/locale.test
+++ b/mysql-test/t/locale.test
@ -144,6 +144,8 @@ SET lc_time_names=@old_50915_lc_time_names;

 # Item::print
 create view v1 as select
+        date_format('2001-10-02', '%c %b %M') as a,
+        date_format('2001-10-02', '%c %b %M', 'ru_RU') as a1,
        format(123456789,2) as b,
        format(123456789,2,'rm_CH') as b1;
 select * from v1;
@ -153,3 +155,29 @@ drop view v1;
 --echo #
 --echo # End of 10.2 tests
 --echo #
+
+#
+# MDEV-11553 Can't restore a PERSISTENT column that uses DATE_FORMAT()
+#
+# 3-argument syntax for DATE_FORMAT()
+select date_format('2001-01-01', '%w %a %W', 'ro_RO');
+select date_format('2001-01-03', '%w %a %W', 'ro_RO');
+select date_format('2001-01-05', '%w %a %W', 'ro_RO');
+select date_format('2001-01-07', '%w %a %W', 'ro_RO');
+select date_format('2001-01-01', '%w %a %W', 'de_AT');
+select date_format('2001-02-01', '%w %a %W', 'de_AT');
+select date_format('2001-03-01', '%w %a %W', 'de_AT');
+select date_format('2001-01-01', '%w %a %W', 'en_US');
+select date_format('2001-03-01', '%c %b %M', 'en_US');
+select date_format('2001-01-01', '%w %a %W', 'rm_CH');
+select date_format('2001-01-03', '%w %a %W', 'rm_CH');
+select date_format('2001-01-05', '%w %a %W', 'rm_CH');
+select date_format('2001-01-07', '%w %a %W', 'rm_CH');
+select date_format('2001-02-01', '%c %b %M', 'rm_CH');
+select date_format('2001-04-01', '%c %b %M', 'rm_CH');
+select date_format('2001-06-01', '%c %b %M', 'rm_CH');
+select date_format('2001-08-01', '%c %b %M', 'rm_CH');
+select date_format('2001-10-01', '%c %b %M', 'rm_CH');
+select date_format('2001-12-01', '%c %b %M', 'rm_CH');
+select date_format('2001-01-06', '%w %a %W', 'de_CH');
+select date_format('2001-09-01', '%c %b %M', 'de_CH');
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@ -1769,6 +1769,19 @@ ALTER TABLE t1 DISABLE KEYS;
 OPTIMIZE TABLE t1;
 DROP TABLE t1;

+#
+# Check FLUSH FOR EXPORT
+#
+
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b)) engine=myisam;
+INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
+                     (6,'0'),(7,'0');
+flush tables test.t1 for export;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+insert into t1 values (8,'0');
+unlock tables;
+drop table t1;
+
 #
 # Check some variables
 #
--- a/mysql-test/t/old-mode.test
+++ b/mysql-test/t/old-mode.test
@ -83,3 +83,39 @@ SELECT TO_DAYS(a), TO_DAYS(b) FROM t1;
 DROP TABLE t1;
 SET @@global.mysql56_temporal_format=DEFAULT;

+#
+# MDEV-12672 Replicated TIMESTAMP fields given wrong value near DST change
+#
+
+# Copy_field
+set time_zone='Europe/Moscow';
+set global mysql56_temporal_format=false;
+create table t1 (a timestamp);
+set timestamp=1288477526;
+insert t1 values (null);
+insert t1 values ();
+set timestamp=1288481126;
+insert t1 values (null);
+insert t1 values ();
+select a, unix_timestamp(a) from t1;
+set global mysql56_temporal_format=true;
+select a, unix_timestamp(a) from t1;
+alter table t1 modify a timestamp;
+select a, unix_timestamp(a) from t1;
+drop table t1;
+
+# field_conv_incompatible()
+set global mysql56_temporal_format=false;
+create table t1 (a timestamp);
+set timestamp=1288477526;
+insert t1 values (null);
+set timestamp=1288481126;
+insert t1 values (null);
+select a, unix_timestamp(a) from t1;
+set global mysql56_temporal_format=true;
+select a, unix_timestamp(a) from t1;
+create table t2 (a timestamp);
+insert t2 select a from t1;
+select a, unix_timestamp(a) from t2;
+drop table t1, t2;
+set time_zone=DEFAULT;
--- a/Show More
+++ b/Show More