Change module prefix in error messages: SCHEDULER -> Event Scheduler,

to not collide with the recently introduced thread scheduler module.


mysql-test/r/events.result:
  Update test results with new error texts (SCHEDULER -> Event Scheduler,
  grammar).
sql/event_data_objects.cc:
  SCHEDULER -> Event Scheduler.
sql/event_queue.cc:
  SCHEDULER -> Event Scheduler.
sql/event_scheduler.cc:
  SCHEDULER -> Event Scheduler.
sql/events.cc:
  SCHEDULER -> Event Scheduler.
sql/share/errmsg.txt:
  SCHEDULER -> Event Scheduler. Fix English grammar.

1 files changed, 13 insertions, 12 deletions

diff --git a/sql/events.cc b/sql/events.cc
index 02e5a292e16..fd8160e103c 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -641,7 +641,7 @@ Events::init()
   if (check_system_tables(thd))
   {
     check_system_tables_error= TRUE;
-    sql_print_error("SCHEDULER: The system tables are damaged. "
+    sql_print_error("Event Scheduler: The system tables are damaged. "
                     "The scheduler subsystem will be unusable during this run.");
     goto end;
   }
@@ -649,7 +649,7 @@ Events::init()
 
   if (event_queue->init_queue(thd) || load_events_from_db(thd))
   {
-    sql_print_error("SCHEDULER: Error while loading from disk.");
+    sql_print_error("Event Scheduler: Error while loading from disk.");
     goto end;
   }
 
@@ -862,7 +862,7 @@ Events::check_system_tables(THD *thd)
 
   if ((ret= simple_open_n_lock_tables(thd, &tables)))
   {
-    sql_print_error("SCHEDULER: Cannot open mysql.db");
+    sql_print_error("Event Scheduler: Cannot open mysql.db");
     ret= TRUE;
   }
   ret= table_check_intact(tables.table, MYSQL_DB_FIELD_COUNT,
@@ -877,7 +877,7 @@ Events::check_system_tables(THD *thd)
 
   if (simple_open_n_lock_tables(thd, &tables))
   {
-    sql_print_error("SCHEDULER: Cannot open mysql.user");
+    sql_print_error("Event Scheduler: Cannot open mysql.user");
     ret= TRUE;
   }
   else
@@ -933,7 +933,7 @@ Events::load_events_from_db(THD *thd)
 
   if ((ret= db_repository->open_event_table(thd, TL_READ, &table)))
   {
-    sql_print_error("SCHEDULER: Table mysql.event is damaged. Can not open");
+    sql_print_error("Event Scheduler: Table mysql.event is damaged. Can not open");
     DBUG_RETURN(EVEX_OPEN_TABLE_FAILED);
   }
 
@@ -950,8 +950,9 @@ Events::load_events_from_db(THD *thd)
 
     if ((ret= et->load_from_row(thd, table)))
     {
-      sql_print_error("SCHEDULER: Error while loading from mysql.event. "
-                      "Table probably corrupted");
+      sql_print_error("Event Scheduler: "
+                      "Error while reading from mysql.event. "
+                      "The table is probably corrupted");
       break;
     }
     if (et->status != Event_queue_element::ENABLED)
@@ -964,7 +965,7 @@ Events::load_events_from_db(THD *thd)
     /* let's find when to be executed */
     if (et->compute_next_execution_time())
     {
-      sql_print_error("SCHEDULER: Error while computing execution time of %s.%s."
+      sql_print_error("Event Scheduler: Error while computing execution time of %s.%s."
                       " Skipping", et->dbname.str, et->name.str);
       continue;
     }
@@ -981,11 +982,11 @@ Events::load_events_from_db(THD *thd)
       */
       switch (ret= temp_job_data.compile(thd, thd->mem_root)) {
       case EVEX_MICROSECOND_UNSUP:
-        sql_print_error("SCHEDULER: mysql.event is tampered. MICROSECOND is not "
+        sql_print_error("Event Scheduler: mysql.event is tampered. MICROSECOND is not "
                         "supported but found in mysql.event");
         break;
       case EVEX_COMPILE_ERROR:
-        sql_print_error("SCHEDULER: Error while compiling %s.%s. Aborting load",
+        sql_print_error("Event Scheduler: Error while compiling %s.%s. Aborting load",
                         et->dbname.str, et->name.str);
         break;
       default:
@@ -1017,8 +1018,8 @@ end:
   else
   {
     ret= 0;
-    sql_print_information("SCHEDULER: Loaded %d event%s", count,
-                          (count == 1)?"":"s");
+    sql_print_information("Event Scheduler: Loaded %d event%s",
+                          count, (count == 1)?"":"s");
   }
 
   close_thread_tables(thd);