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

Remove some error log spam by not effectively setting DEBUG_DBUG='d'.

Browse Source 
Thanks to Sergei Golubchik for this suggestion.
This commit is contained in:
Marko Mäkelä
2017-02-07 16:09:24 +02:00
parent 2e67e66c3a
commit 257eea3dac
2 changed files with 96 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
mysql-test/suite/innodb/t/innodb-wl5522-debug.test
View File

@ -27,7 +27,6 @@ let $pathfix=/: '.*test_wl5522.*t1.ibd'/: 'test_wl5522\\t1.ibd'/;
let $strerrfix=/ (\(.+\))//;
SET GLOBAL innodb_file_per_table = 1;
SELECT @@innodb_file_per_table;
DROP DATABASE IF EXISTS test_wl5522;
CREATE DATABASE test_wl5522;
@ -49,7 +48,6 @@ ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
--source include/wait_until_connected_again.inc
--disable_reconnect
SET SESSION debug_dbug="-d,ib_discard_before_commit_crash";
DROP TABLE test_wl5522.t1;
#### Before DISCARD commit crash
@ -73,12 +71,10 @@ ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
--source include/wait_until_connected_again.inc
--disable_reconnect
SET SESSION debug_dbug="-d,ib_discard_after_commit_crash";
DROP TABLE test_wl5522.t1;
#### After DISCARD commit crash
SET GLOBAL innodb_file_per_table = 1;
SELECT @@innodb_file_per_table;
# Create the table that we will use for crash recovery (during IMPORT)
CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
@ -127,7 +123,6 @@ ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
--source include/wait_until_connected_again.inc
--disable_reconnect
SET SESSION debug_dbug="-d,ib_import_before_commit_crash";
#### Before commit crash
# Check that the DD is consistent after recovery
@ -160,7 +155,6 @@ EOF
--source include/wait_until_connected_again.inc
--disable_reconnect
SET SESSION debug_dbug="-d,ib_import_before_checkpoint_crash";
#### Before checkpoint crash
# After the above test the results are non-deterministic, recreate the table
@ -196,6 +190,7 @@ DROP TABLE test_wl5522.t1;
CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
INSERT INTO test_wl5522.t1 VALUES (1);
SET @saved_debug_dbug = @@SESSION.debug_dbug;
SET SESSION debug_dbug="+d,ib_export_io_write_failure_1";
--replace_regex /, .*\).*t1.cfg/, Bad file descriptor) t1.cfg/
@ -203,8 +198,7 @@ SET SESSION debug_dbug="+d,ib_export_io_write_failure_1";
FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_1";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -220,7 +214,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_2";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -235,7 +229,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_3";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -250,7 +244,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_4";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -265,7 +259,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_5";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -281,7 +275,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_6";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -297,7 +291,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_7";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -313,7 +307,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_8";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -328,7 +322,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_9";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -344,7 +338,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_10";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -360,7 +354,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_11";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -376,7 +370,7 @@ FLUSH TABLES test_wl5522.t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug="-d,ib_export_io_write_failure_12";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -416,7 +410,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_1";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -440,7 +434,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_2";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -464,7 +458,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_3";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -488,7 +482,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_4";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -512,7 +506,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_5";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -536,7 +530,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_6";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -560,7 +554,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_7";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -584,7 +578,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_8";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -608,7 +602,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_io_read_error_9";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -633,7 +627,7 @@ EOF
--error ER_IO_READ_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_string_read_error";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -660,7 +654,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_1";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_1";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -692,7 +686,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_2";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_2";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -724,7 +718,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_4";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_4";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -756,7 +750,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_5";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_5";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -787,7 +781,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_6";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_6";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -817,7 +811,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_7";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_7";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -847,7 +841,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_8";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_8";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -877,7 +871,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_9";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_9";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -907,7 +901,7 @@ SET SESSION debug_dbug="+d,ib_import_OOM_10";
--error ER_OUT_OF_RESOURCES
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_OOM_10";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -939,7 +933,7 @@ SET SESSION debug_dbug="+d,ib_import_internal_error";
--error ER_INTERNAL_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_internal_error";
SET SESSION debug_dbug=@saved_debug_dbug;
# Restore files
perl;
@ -980,7 +974,7 @@ do "$ENV{MTR_SUITE_DIR}/include/innodb-util.pl";
ib_restore_tablespaces("test_wl5522", "t1");
EOF
SET SESSION debug_dbug="-d,ib_import_reset_space_and_lsn_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Test failure after attempting a tablespace open
SET SESSION debug_dbug="+d,ib_import_open_tablespace_failure";
@ -990,7 +984,7 @@ SET SESSION debug_dbug="+d,ib_import_open_tablespace_failure";
--error ER_GET_ERRMSG
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_open_tablespace_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Restore files
perl;
@ -1005,7 +999,7 @@ SET SESSION debug_dbug="+d,ib_import_check_bitmap_failure";
--error ER_NOT_KEYFILE
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_check_bitmap_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Restore files
perl;
@ -1019,7 +1013,7 @@ SET SESSION debug_dbug="+d,ib_import_cluster_root_adjust_failure";
--error ER_NOT_KEYFILE
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_cluster_root_adjust_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Restore files
perl;
@ -1033,7 +1027,7 @@ SET SESSION debug_dbug="+d,ib_import_cluster_failure";
--error ER_NOT_KEYFILE
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_cluster_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Restore files
perl;
@ -1047,7 +1041,7 @@ SET SESSION debug_dbug="+d,ib_import_sec_root_adjust_failure";
--error ER_NOT_KEYFILE
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_sec_root_adjust_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Restore files
perl;
@ -1061,7 +1055,7 @@ SET SESSION debug_dbug="+d,ib_import_set_max_rowid_failure";
--error ER_NOT_KEYFILE
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_set_max_rowid_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
# Left over from the failed IMPORT
perl;
@ -1244,7 +1238,7 @@ SET SESSION debug_dbug="+d,ib_import_trigger_corruption_1";
--error ER_INTERNAL_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_trigger_corruption_1";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1275,7 +1269,7 @@ SET SESSION debug_dbug="+d,buf_page_is_corrupt_failure";
--error ER_INTERNAL_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,buf_page_is_corrupt_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1305,7 +1299,7 @@ SET SESSION debug_dbug="+d,ib_import_trigger_corruption_2";
--error ER_INNODB_INDEX_CORRUPT
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_trigger_corruption_2";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1335,7 +1329,7 @@ SET SESSION debug_dbug="+d,ib_import_trigger_corruption_3";
--error ER_NOT_KEYFILE
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,ib_import_trigger_corruption_3";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1355,7 +1349,7 @@ SET SESSION debug_dbug="+d,ib_import_create_index_failure_1";
ALTER TABLE test_wl5522.t1 ADD INDEX idx(c1);
SET SESSION debug_dbug="-d,ib_import_create_index_failure_1";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1386,7 +1380,7 @@ SET SESSION debug_dbug="+d,fil_space_create_failure";
--error ER_GET_ERRMSG
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,fil_space_create_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1417,7 +1411,7 @@ SET SESSION debug_dbug="+d,dict_tf_to_fsp_flags_failure";
--error ER_GET_ERRMSG
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,dict_tf_to_fsp_flags_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1448,7 +1442,7 @@ SET SESSION debug_dbug="+d,fsp_flags_is_valid_failure";
--error ER_INTERNAL_ERROR
ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
SET SESSION debug_dbug="-d,fsp_flags_is_valid_failure";
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
@ -1497,4 +1491,3 @@ call mtr.add_suppression("while reading index meta-data, expected to read 44 byt
--remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;