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

MDEV-25568 RENAME TABLE causes "Ignoring data file" messages

Browse Source 
fil_ibd_load(): Remove a message that is basically saying that
everything works as expected. The other "Ignoring data file" message
about the presence of an extraneous file will be retained
(and expected by the test innodb.log_file_name).
This commit is contained in:
Marko Mäkelä
2021-04-30 09:37:50 +03:00
parent 26148e2a67
commit 65d2fbaf77
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/innodb/r/log_file_name.result
View File

@ -21,7 +21,6 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES
WHERE engine = 'innodb' WHERE engine = 'innodb'
AND support IN ('YES', 'DEFAULT', 'ENABLED'); AND support IN ('YES', 'DEFAULT', 'ENABLED');
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
FOUND 1 /InnoDB: Ignoring data file '.*t1.ibd' with space ID.*/ in mysqld.1.err
FOUND 1 /InnoDB: Tablespace \d+ was not found at.*t3.ibd.*/ in mysqld.1.err FOUND 1 /InnoDB: Tablespace \d+ was not found at.*t3.ibd.*/ in mysqld.1.err
# Fault 3: Wrong space_id in a dirty file, and no missing file. # Fault 3: Wrong space_id in a dirty file, and no missing file.
SELECT * FROM INFORMATION_SCHEMA.ENGINES SELECT * FROM INFORMATION_SCHEMA.ENGINES

3
mysql-test/suite/innodb/t/log_file_name.test
View File

@ -54,9 +54,6 @@ let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Ano
--source include/start_mysqld.inc --source include/start_mysqld.inc
eval $check_no_innodb; eval $check_no_innodb;
let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t1.ibd' with space ID.*;
--source include/search_pattern_in_file.inc
let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at.*t3.ibd.*; let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at.*t3.ibd.*;
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc

15
storage/innobase/fil/fil0fil.cc
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1995, 2021, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1995, 2021, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 2020, MariaDB Corporation. Copyright (c) 2014, 2021, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
@ -4356,7 +4356,7 @@ fil_ibd_load(
space = fil_space_get_by_id(space_id); space = fil_space_get_by_id(space_id);
mutex_exit(&fil_system->mutex); mutex_exit(&fil_system->mutex);
if (space != NULL) { if (space) {
/* Compare the filename we are trying to open with the /* Compare the filename we are trying to open with the
filename from the first node of the tablespace we opened filename from the first node of the tablespace we opened
previously. Fail if it is different. */ previously. Fail if it is different. */
@ -4368,8 +4368,8 @@ fil_ibd_load(
<< "' with space ID " << space->id << "' with space ID " << space->id
<< ". Another data file called " << node->name << ". Another data file called " << node->name
<< " exists with the same space ID."; << " exists with the same space ID.";
space = NULL; space = NULL;
return(FIL_LOAD_ID_CHANGED); return(FIL_LOAD_ID_CHANGED);
} }
return(FIL_LOAD_OK); return(FIL_LOAD_OK);
} }
@ -4406,13 +4406,6 @@ fil_ibd_load(
os_offset_t minimum_size; os_offset_t minimum_size;
case DB_SUCCESS: case DB_SUCCESS:
if (file.space_id() != space_id) { if (file.space_id() != space_id) {
ib::info()
<< "Ignoring data file '"
<< file.filepath()
<< "' with space ID " << file.space_id()
<< ", since the redo log references "
<< file.filepath() << " with space ID "
<< space_id << ".";
return(FIL_LOAD_ID_CHANGED); return(FIL_LOAD_ID_CHANGED);
} }
/* Get and test the file size. */ /* Get and test the file size. */