Less noise in the error log

- Updated error messages for recovery
- Changed printing of debug sync point information to make it fit 80 char

4 files changed, 17 insertions, 18 deletions

diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index dde3ce5a35b..1fbb15592a4 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -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);
     }
   }
 
diff --git a/sql/event_queue.cc b/sql/event_queue.cc
index 7a549e325bc..873be03faac 100644
--- a/sql/event_queue.cc
+++ b/sql/event_queue.cc
@@ -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);
diff --git a/sql/handler.cc b/sql/handler.cc
index e67148fb5d3..610c7deb19b 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -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);
 }
 
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index bc37d8a947d..84c3109c136 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -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!");
+  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);