database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix rpl_binlog_errors test not to leave dbug enabled

Browse Source
This commit is contained in:
Sergei Golubchik
2017-01-29 12:02:56 +01:00
parent d2f84ab978
commit ef0db6bfd1
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/extra/rpl_tests/rpl_binlog_errors.inc
View File

@ -50,7 +50,7 @@ call mtr.add_suppression("Can't generate a unique log-filename");
call mtr.add_suppression("Writing one row to the row-based binary log failed.*"); call mtr.add_suppression("Writing one row to the row-based binary log failed.*");
call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Error writing file .*");
SET @old_debug= @@global.debug; SET @old_debug= @@global.debug_dbug;
### ACTION: create a large file (> 4096 bytes) that will be later used ### ACTION: create a large file (> 4096 bytes) that will be later used
### in LOAD DATA INFILE to check binlog errors in its vacinity ### in LOAD DATA INFILE to check binlog errors in its vacinity
@ -296,7 +296,7 @@ SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
-- replace_regex /\.[\\\/]master/master/ -- replace_regex /\.[\\\/]master/master/
-- error ER_CANT_OPEN_FILE -- error ER_CANT_OPEN_FILE
FLUSH LOGS; FLUSH LOGS;
SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; SET GLOBAL debug_dbug=@old_debug;
-- error ER_NO_BINARY_LOGGING -- error ER_NO_BINARY_LOGGING
SHOW BINARY LOGS; SHOW BINARY LOGS;
@ -324,7 +324,7 @@ SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
-- replace_regex /\.[\\\/]master/master/ -- replace_regex /\.[\\\/]master/master/
-- error ER_CANT_OPEN_FILE -- error ER_CANT_OPEN_FILE
FLUSH LOGS; FLUSH LOGS;
SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; SET GLOBAL debug_dbug=@old_debug;
-- error ER_FLUSH_MASTER_BINLOG_CLOSED -- error ER_FLUSH_MASTER_BINLOG_CLOSED
RESET MASTER; RESET MASTER;
@ -351,7 +351,7 @@ DROP TABLE t5;
SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
-- error ER_ERROR_ON_WRITE -- error ER_ERROR_ON_WRITE
FLUSH LOGS; FLUSH LOGS;
SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; SET GLOBAL debug_dbug=@old_debug;
-- error ER_FLUSH_MASTER_BINLOG_CLOSED -- error ER_FLUSH_MASTER_BINLOG_CLOSED
RESET MASTER; RESET MASTER;

8
mysql-test/suite/binlog_encryption/rpl_binlog_errors.result
View File

@ -9,7 +9,7 @@ connection master;
call mtr.add_suppression("Can't generate a unique log-filename"); call mtr.add_suppression("Can't generate a unique log-filename");
call mtr.add_suppression("Writing one row to the row-based binary log failed.*"); call mtr.add_suppression("Writing one row to the row-based binary log failed.*");
call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Error writing file .*");
SET @old_debug= @@global.debug; SET @old_debug= @@global.debug_dbug;
SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data'; SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data';
SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data'; SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data';
RESET MASTER; RESET MASTER;
@ -180,7 +180,7 @@ Level Code Message
SET GLOBAL debug_dbug="+d,fault_injection_registering_index"; SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
FLUSH LOGS; FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1 "Operation not permitted") ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1 "Operation not permitted")
SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; SET GLOBAL debug_dbug=@old_debug;
SHOW BINARY LOGS; SHOW BINARY LOGS;
ERROR HY000: You are not using binary logging ERROR HY000: You are not using binary logging
CREATE TABLE t5 (a INT); CREATE TABLE t5 (a INT);
@ -194,7 +194,7 @@ include/rpl_restart_server.inc [server_number=1]
SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
FLUSH LOGS; FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin.index' (errno: 1 "Operation not permitted") ERROR HY000: Can't open file: 'master-bin.index' (errno: 1 "Operation not permitted")
SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; SET GLOBAL debug_dbug=@old_debug;
RESET MASTER; RESET MASTER;
ERROR HY000: Binlog closed, cannot RESET MASTER ERROR HY000: Binlog closed, cannot RESET MASTER
CREATE TABLE t5 (a INT); CREATE TABLE t5 (a INT);
@ -208,7 +208,7 @@ include/rpl_restart_server.inc [server_number=1]
SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
FLUSH LOGS; FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory") ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; SET GLOBAL debug_dbug=@old_debug;
RESET MASTER; RESET MASTER;
ERROR HY000: Binlog closed, cannot RESET MASTER ERROR HY000: Binlog closed, cannot RESET MASTER
CREATE TABLE t5 (a INT); CREATE TABLE t5 (a INT);

8
mysql-test/suite/rpl/r/rpl_binlog_errors.result
View File

@ -9,7 +9,7 @@ connection master;
call mtr.add_suppression("Can't generate a unique log-filename"); call mtr.add_suppression("Can't generate a unique log-filename");
call mtr.add_suppression("Writing one row to the row-based binary log failed.*"); call mtr.add_suppression("Writing one row to the row-based binary log failed.*");
call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Error writing file .*");
SET @old_debug= @@global.debug; SET @old_debug= @@global.debug_dbug;
SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data'; SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data';
SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data'; SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data';
RESET MASTER; RESET MASTER;
@ -180,7 +180,7 @@ Level Code Message
SET GLOBAL debug_dbug="+d,fault_injection_registering_index"; SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
FLUSH LOGS; FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1 "Operation not permitted") ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1 "Operation not permitted")
SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; SET GLOBAL debug_dbug=@old_debug;
SHOW BINARY LOGS; SHOW BINARY LOGS;
ERROR HY000: You are not using binary logging ERROR HY000: You are not using binary logging
CREATE TABLE t5 (a INT); CREATE TABLE t5 (a INT);
@ -194,7 +194,7 @@ include/rpl_restart_server.inc [server_number=1]
SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
FLUSH LOGS; FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin.index' (errno: 1 "Operation not permitted") ERROR HY000: Can't open file: 'master-bin.index' (errno: 1 "Operation not permitted")
SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; SET GLOBAL debug_dbug=@old_debug;
RESET MASTER; RESET MASTER;
ERROR HY000: Binlog closed, cannot RESET MASTER ERROR HY000: Binlog closed, cannot RESET MASTER
CREATE TABLE t5 (a INT); CREATE TABLE t5 (a INT);
@ -208,7 +208,7 @@ include/rpl_restart_server.inc [server_number=1]
SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
FLUSH LOGS; FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory") ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; SET GLOBAL debug_dbug=@old_debug;
RESET MASTER; RESET MASTER;
ERROR HY000: Binlog closed, cannot RESET MASTER ERROR HY000: Binlog closed, cannot RESET MASTER
CREATE TABLE t5 (a INT); CREATE TABLE t5 (a INT);