Merge branch 'mysql-5.6' into mysql-5.7

Author: Parveez Baig

mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test

@@ -371,7 +371,54 @@ COMMIT;
 --let $diff_tables= master:t1,slave:t1
 --source include/diff_tables.inc
 
---echo ######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+--echo ####### 8 - LOAD DATA INFILE INTO TABLE #######
+
+#
+# This scenario verifies that load data infile fails when
+# binlog cache exceeds max_binlog_cache_size
+#
+--source include/rpl_connection_master.inc
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+
+# Save the current binary log position
+--let $pos_before= query_get_value(show master status,Position,1)
+
+--disable_query_log
+--let $write_var =`SELECT REPEAT('Testing\n', 1000)`
+--let $write_to_file = GENERATE
+--source include/write_var_to_file.inc
+--enable_query_log
+
+# Below transaction generates transaction cache more than
+# the max_binlog_cache_size i.e 4096. Hence results in error.
+--replace_result $write_to_file temp_file
+--error ER_TRANS_CACHE_FULL
+eval LOAD DATA INFILE '$write_to_file' INTO TABLE t6;
+
+--exec rm $write_to_file
+
+# Check that the above transaction has not been logged in the binary log
+--let $assert_text= assert that the above Event has not been added to binlog
+--let $assert_cond= [SHOW MASTER STATUS, Position,1] = $pos_before
+--source include/assert.inc
+
+# Check that the table is empty on master
+--let $assert_text = Check that the LOAD DATA didn't add any data into the table
+--let $assert_cond = [SELECT COUNT(*) FROM t6] = 0
+--source include/assert.inc
+
+--source include/sync_slave_sql_with_master.inc
+
+# Check that the table is empty on slave
+--let $assert_text = Check that the LOAD DATA didn't add any data into the table
+--let $assert_cond = [SELECT COUNT(*) FROM t6] = 0
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t6;
+--source include/sync_slave_sql_with_master.inc
+
+--echo ######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 --echo #########     max_binlog_cache_size crashes slave                ##########
 
 --echo # [ On Slave ]

mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result

@@ -122,7 +122,19 @@ BEGIN;
 Got one of the listed errors
 COMMIT;
 include/diff_tables.inc [master:t1,slave:t1]
-######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+####### 8 - LOAD DATA INFILE INTO TABLE #######
+[connection master]
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+LOAD DATA INFILE 'temp_file' INTO TABLE t6;
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+include/assert.inc [assert that the above Event has not been added to binlog]
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+[connection master]
+DROP TABLE t6;
+include/sync_slave_sql_with_master.inc
+######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 #########     max_binlog_cache_size crashes slave                ##########
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;

mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result

@@ -112,7 +112,19 @@ BEGIN;
 Got one of the listed errors
 COMMIT;
 include/diff_tables.inc [master:t1,slave:t1]
-######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+####### 8 - LOAD DATA INFILE INTO TABLE #######
+[connection master]
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+LOAD DATA INFILE 'temp_file' INTO TABLE t6;
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+include/assert.inc [assert that the above Event has not been added to binlog]
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+[connection master]
+DROP TABLE t6;
+include/sync_slave_sql_with_master.inc
+######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 #########     max_binlog_cache_size crashes slave                ##########
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;

mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result

@@ -122,7 +122,19 @@ BEGIN;
 Got one of the listed errors
 COMMIT;
 include/diff_tables.inc [master:t1,slave:t1]
-######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+####### 8 - LOAD DATA INFILE INTO TABLE #######
+[connection master]
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+LOAD DATA INFILE 'temp_file' INTO TABLE t6;
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+include/assert.inc [assert that the above Event has not been added to binlog]
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+[connection master]
+DROP TABLE t6;
+include/sync_slave_sql_with_master.inc
+######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 #########     max_binlog_cache_size crashes slave                ##########
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;