BUG#46166

Post-push fixes:

  - fixed platform dependent result files
  - appeasing valgrind warnings:
   
    Fault injection was also uncovering a previously existing 
    potential mem leaks. For BUG#46166 testing purposes, fixed 
    by forcing handling the leak when injecting faults.

2 files changed, 11 insertions, 9 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
index e67b60860ca..6c8c750bc79 100644
--- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -35,9 +35,9 @@ master-bin.000001	#
 SET GLOBAL debug="";
 RESET MASTER;
 ###################### TEST #3
-CREATE TABLE t1 (a int);
-CREATE TABLE t2 (a TEXT) Engine=InnoDB;
-CREATE TABLE t4 (a TEXT);
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (a VARCHAR(16384)) Engine=InnoDB;
+CREATE TABLE t4 (a VARCHAR(16384));
 INSERT INTO t1 VALUES (1);
 RESET MASTER;
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
@@ -181,7 +181,7 @@ SHOW WARNINGS;
 Level	Code	Message
 SET GLOBAL debug="+d,fault_injection_registering_index";
 FLUSH LOGS;
-ERROR HY000: Can't open file: './master-bin.000002' (errno: 1)
+ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1)
 SET GLOBAL debug="-d,fault_injection_registering_index";
 SHOW BINARY LOGS;
 ERROR HY000: You are not using binary logging
@@ -194,7 +194,7 @@ DROP TABLE t5;
 ###################### TEST #11
 SET GLOBAL debug="+d,fault_injection_openning_index";
 FLUSH LOGS;
-ERROR HY000: Can't open file: './master-bin.index' (errno: 1)
+ERROR HY000: Can't open file: 'master-bin.index' (errno: 1)
 SET GLOBAL debug="-d,fault_injection_openning_index";
 RESET MASTER;
 ERROR HY000: Binlog closed, cannot RESET MASTER
@@ -207,7 +207,7 @@ DROP TABLE t5;
 ###################### TEST #12
 SET GLOBAL debug="+d,fault_injection_new_file_rotate_event";
 FLUSH LOGS;
-ERROR HY000: Can't open file: 'master-bin' (errno: 0)
+ERROR HY000: Can't open file: 'master-bin' (errno: 2)
 SET GLOBAL debug="-d,fault_injection_new_file_rotate_event";
 RESET MASTER;
 ERROR HY000: Binlog closed, cannot RESET MASTER
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test
index ae83659a38a..e4eb212e1cd 100644
--- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test
@@ -82,9 +82,9 @@ RESET MASTER;
 
 ### ACTION: create some tables (t1, t2, t4) and insert some values in
 ###         table t1
-CREATE TABLE t1 (a int);
-CREATE TABLE t2 (a TEXT) Engine=InnoDB;
-CREATE TABLE t4 (a TEXT);
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (a VARCHAR(16384)) Engine=InnoDB;
+CREATE TABLE t4 (a VARCHAR(16384));
 INSERT INTO t1 VALUES (1);
 RESET MASTER;
 
@@ -272,6 +272,7 @@ SHOW WARNINGS;
 
 # +d,fault_injection_registering_index => injects fault on MYSQL_BIN_LOG::open
 SET GLOBAL debug="+d,fault_injection_registering_index";
+-- replace_regex /\.[\\\/]master/master/
 -- error ER_CANT_OPEN_FILE
 FLUSH LOGS;
 SET GLOBAL debug="-d,fault_injection_registering_index";
@@ -298,6 +299,7 @@ DROP TABLE t5;
 
 # +d,fault_injection_openning_index => injects fault on MYSQL_BIN_LOG::open_index_file
 SET GLOBAL debug="+d,fault_injection_openning_index";
+-- replace_regex /\.[\\\/]master/master/
 -- error ER_CANT_OPEN_FILE
 FLUSH LOGS;
 SET GLOBAL debug="-d,fault_injection_openning_index";