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

Less noise in the error log

Browse Source 
- Updated error messages for recovery
- Changed printing of debug sync point information to make it fit 80 char
This commit is contained in:
Monty
2021-03-15 15:45:47 +02:00
committed by Sergei Golubchik
parent 249263525f
commit d754d3d951
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/debug_sync.cc
View File

@ -201,13 +201,12 @@ void debug_sync_end(void)
/* Print statistics. */
{
char llbuff[22];
sql_print_information("Debug sync points hit: %22s",
llstr(debug_sync_global.dsp_hits, llbuff));
sql_print_information("Debug sync points executed: %22s",
llstr(debug_sync_global.dsp_executed, llbuff));
sql_print_information("Debug sync points max active per thread: %22s",
llstr(debug_sync_global.dsp_max_active, llbuff));
sql_print_information("Debug sync points hit: %lld",
debug_sync_global.dsp_hits);
sql_print_information("Debug sync points executed: %lld",
debug_sync_global.dsp_executed);
sql_print_information("Debug sync points max active per thread: %lld",
debug_sync_global.dsp_max_active);
}
}

6
sql/event_queue.cc
View File

@ -516,8 +516,10 @@ Event_queue::empty_queue()
uint i;
DBUG_ENTER("Event_queue::empty_queue");
DBUG_PRINT("enter", ("Purging the queue. %u element(s)", queue.elements));
sql_print_information("Event Scheduler: Purging the queue. %u events",
queue.elements);
if (queue.elements)
sql_print_information("Event Scheduler: Purging the queue. %u events",
queue.elements);
/* empty the queue */
for (i= queue_first_element(&queue);
i <= queue_last_element(&queue);

4
sql/handler.cc
View File

@ -2403,7 +2403,7 @@ int ha_recover(HASH *commit_list)
DBUG_RETURN(0);
if (info.commit_list)
sql_print_information("Starting crash recovery...");
sql_print_information("Starting table crash recovery...");
for (info.len= MAX_XID_LIST_SIZE ;
info.list==0 && info.len > MIN_XID_LIST_SIZE; info.len/=2)
@ -2437,7 +2437,7 @@ int ha_recover(HASH *commit_list)
DBUG_RETURN(1);
}
if (info.commit_list)
sql_print_information("Crash recovery finished.");
sql_print_information("Crash table recovery finished.");
DBUG_RETURN(0);
}

14
sql/rpl_mi.cc
View File

@ -1224,17 +1224,15 @@ bool Master_info_index::init_all_master_info()
if (!err_num) // No Error on read Master_info
{
if (global_system_variables.log_warnings > 1)
if (global_system_variables.log_warnings > 2)
sql_print_information("Reading of all Master_info entries succeeded");
DBUG_RETURN(0);
}
if (succ_num) // Have some Error and some Success
{
sql_print_warning("Reading of some Master_info entries failed");
DBUG_RETURN(1);
}
sql_print_error("Reading of all Master_info entries failed!");
if (succ_num) // Have some Error and some Success
sql_print_warning("Reading of some Master_info entries failed");
else
sql_print_error("Reading of all Master_info entries failed!");
DBUG_RETURN(1);
error:
@ -1431,7 +1429,7 @@ bool Master_info_index::add_master_info(Master_info *mi, bool write_to_file)
if (unlikely(abort_loop) ||
!my_hash_insert(&master_info_hash, (uchar*) mi))
{
if (global_system_variables.log_warnings > 1)
if (global_system_variables.log_warnings > 2)
sql_print_information("Added new Master_info '%.*s' to hash table",
(int) mi->connection_name.length,
mi->connection_name.str);