database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

rename debug variable to debug_dbug, to make test pass in release builds

Browse Source 
(and to follow the naming conventons).
keep old debug variable, but mark it as deprecated.
This commit is contained in:
Sergei Golubchik
2011-12-15 22:07:58 +01:00
parent b86ba751da
commit 1efdd5a572
147 changed files with 1039 additions and 985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mysql-test/suite/rpl/t/rpl_binlog_errors.test
View File

@@ -68,14 +68,14 @@ FLUSH LOGS;
### (should show just one binlog)
RESET MASTER;
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
-- error ER_NO_UNIQUE_LOGFILE
FLUSH LOGS;
-- echo # assert: must show one binlog
-- source include/show_binary_logs.inc
### ACTION: clean up and move to next test
SET GLOBAL debug="";
SET GLOBAL debug_dbug="";
RESET MASTER;
-- echo ###################### TEST #3
@@ -100,7 +100,7 @@ RESET MASTER;
-- source include/show_binary_logs.inc
# clean up the table and the binlog to be used in next part of test
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
DELETE FROM t2;
RESET MASTER;
@@ -111,7 +111,7 @@ RESET MASTER;
### changes performed despite the fact that it reported an
### error.
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-- error ER_NO_UNIQUE_LOGFILE
-- eval LOAD DATA INFILE '$load_file' INTO TABLE t2
@@ -121,7 +121,7 @@ SET GLOBAL debug="+d,error_unique_log_filename";
SELECT count(*) FROM t2;
# clean up the table and the binlog to be used in next part of test
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
DELETE FROM t2;
RESET MASTER;
@@ -130,7 +130,7 @@ RESET MASTER;
### ASSERTION: load the small file into a transactional table and
### check that it succeeds
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-- eval LOAD DATA INFILE '$load_file2' INTO TABLE t2
@@ -139,7 +139,7 @@ SET GLOBAL debug="+d,error_unique_log_filename";
SELECT count(*) FROM t2;
# clean up the table and the binlog to be used in next part of test
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
DELETE FROM t2;
RESET MASTER;
@@ -150,7 +150,7 @@ RESET MASTER;
### fails we get the error. Transaction is not rolledback
### because rotation happens after the commit.
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
SET AUTOCOMMIT=0;
INSERT INTO t2 VALUES ('muse');
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
@@ -165,7 +165,7 @@ SELECT count(*) FROM t2;
### ACTION: clean up and move to the next test
SET AUTOCOMMIT= 1;
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
DELETE FROM t2;
RESET MASTER;
@@ -175,7 +175,7 @@ RESET MASTER;
### fails then an error is reported and an incident event
### is written to the current binary log.
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
SELECT count(*) FROM t4;
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-- error ER_NO_UNIQUE_LOGFILE
@@ -185,7 +185,7 @@ SELECT count(*) FROM t4;
SELECT count(*) FROM t4;
-- echo ### check that the incident event is written to the current log
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
-- let $binlog_limit= 4,1
-- source include/show_binlog_events.inc
@@ -198,7 +198,7 @@ RESET MASTER;
### ASSERTION: check that statements end up in error but they succeed
### on changing the data.
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
-- echo # must show 0 entries
SELECT count(*) FROM t4;
SELECT count(*) FROM t2;
@@ -229,13 +229,13 @@ SELECT count(*) FROM t4;
SELECT count(*) FROM t2;
# remove fault injection
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
-- echo ###################### TEST #9
### ASSERTION: check that if we disable binlogging, then statements
### succeed.
SET GLOBAL debug="+d,error_unique_log_filename";
SET GLOBAL debug_dbug="+d,error_unique_log_filename";
SET SQL_LOG_BIN=0;
INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc'), ('ddd');
INSERT INTO t4 VALUES ('eee'), ('fff'), ('ggg'), ('hhh');
@@ -248,7 +248,7 @@ DELETE FROM t4;
SELECT count(*) FROM t2;
SELECT count(*) FROM t4;
SET SQL_LOG_BIN=1;
SET GLOBAL debug="-d,error_unique_log_filename";
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
-- echo ###################### TEST #10
@@ -263,11 +263,11 @@ RESET MASTER;
SHOW WARNINGS;
# +d,fault_injection_registering_index => injects fault on MYSQL_BIN_LOG::open
SET GLOBAL debug="+d,fault_injection_registering_index";
SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
-- replace_regex /\.[\\\/]master/master/
-- error ER_CANT_OPEN_FILE
FLUSH LOGS;
SET GLOBAL debug="-d,fault_injection_registering_index";
SET GLOBAL debug_dbug="-d,fault_injection_registering_index";
-- error ER_NO_BINARY_LOGGING
SHOW BINARY LOGS;
@@ -291,11 +291,11 @@ DROP TABLE t5;
--source include/rpl_restart_server.inc
# +d,fault_injection_openning_index => injects fault on MYSQL_BIN_LOG::open_index_file
SET GLOBAL debug="+d,fault_injection_openning_index";
SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
-- replace_regex /\.[\\\/]master/master/
-- error ER_CANT_OPEN_FILE
FLUSH LOGS;
SET GLOBAL debug="-d,fault_injection_openning_index";
SET GLOBAL debug_dbug="-d,fault_injection_openning_index";
-- error ER_FLUSH_MASTER_BINLOG_CLOSED
RESET MASTER;
@@ -319,10 +319,10 @@ DROP TABLE t5;
### file.
# +d,fault_injection_new_file_rotate_event => injects fault on MYSQL_BIN_LOG::MYSQL_BIN_LOG::new_file_impl
SET GLOBAL debug="+d,fault_injection_new_file_rotate_event";
SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
-- error ER_ERROR_ON_WRITE
FLUSH LOGS;
SET GLOBAL debug="-d,fault_injection_new_file_rotate_event";
SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event";
-- error ER_FLUSH_MASTER_BINLOG_CLOSED
RESET MASTER;
@@ -340,7 +340,7 @@ DROP TABLE t5;
--source include/rpl_restart_server.inc
## clean up
SET GLOBAL debug= @old_debug;
SET GLOBAL debug_dbug= @old_debug;
DROP TABLE t1, t2, t4;
RESET MASTER;
@@ -398,7 +398,7 @@ call mtr.add_suppression("Can't generate a unique log-filename .*");
### clean up
-- source include/stop_slave_sql.inc
SET GLOBAL debug=@old_debug;
SET GLOBAL debug_dbug=@old_debug;
RESET SLAVE;
RESET MASTER;
--let $rpl_only_running_threads= 1