Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix misleading error messages #5297

Open
wants to merge 1 commit into
base: 8.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mysql-test/t/percona_dd_upgrade_file_per_table_off.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
--source include/have_util_unzip.inc

--disable_query_log
call mtr.add_suppression("Error in renaming mysql_index_stats.ibd");
call mtr.add_suppression("Missing required files mysql/innodb_index_stats.ibd.");
call mtr.add_suppression("Missing required files mysql/innodb_table_stats.ibd.");
call mtr.add_suppression("Resizing redo log from");
call mtr.add_suppression("Upgrading redo log");
call mtr.add_suppression("Starting to delete and rewrite log files");
Expand Down
5 changes: 4 additions & 1 deletion share/messages_to_error_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3042,7 +3042,10 @@ ER_RES_GRP_SOLARIS_PROCESSOR_AFFINITY_FAILED
eng "%s failed: processor_affinity failed (error code %d - %-.192s)."

ER_DD_UPGRADE_RENAME_IDX_STATS_FILE_FAILED
eng "Error in renaming mysql_index_stats.ibd."
eng "Missing required files mysql/innodb_index_stats.ibd."

ER_DD_UPGRADE_RENAME_TBL_STATS_FILE_FAILED
eng "Missing required files mysql/innodb_table_stats.ibd."

ER_DD_UPGRADE_DD_OPEN_FAILED
eng "Error in opening data directory %s."
Expand Down
2 changes: 1 addition & 1 deletion sql/dd/upgrade_57/upgrade.cc
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static void rename_stats_tables() {
table_stats.c_str(), IBD_EXT.c_str(), 0, &not_used);

if (mysql_file_rename(key_file_misc, from_path, to_path, MYF(0))) {
LogErr(WARNING_LEVEL, ER_DD_UPGRADE_RENAME_IDX_STATS_FILE_FAILED);
LogErr(WARNING_LEVEL, ER_DD_UPGRADE_RENAME_TBL_STATS_FILE_FAILED);
}
}

Expand Down