From 6c9a6bad4fe90c8bfcfe6dbf46835a39edc95c6f Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 24 Apr 2019 10:52:06 +0100 Subject: MDEV-19262 Server error message is unclear if event is created and event_scheduler = DISABLED Change error message. --- mysql-test/r/events_restart.result | 20 ++++++++++---------- sql/share/errmsg-utf8.txt | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mysql-test/r/events_restart.result b/mysql-test/r/events_restart.result index 0caac907f64..6e3baccd5df 100644 --- a/mysql-test/r/events_restart.result +++ b/mysql-test/r/events_restart.result @@ -20,25 +20,25 @@ select @@event_scheduler; @@event_scheduler OFF show events; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled select event_name from information_schema.events; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled show create event intact_check; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled drop event no_such_event; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled create event intact_check_1 on schedule every 5 hour do select 5; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled alter event intact_check_1 on schedule every 8 hour do select 8; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled alter event intact_check_1 rename to intact_check_2; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled drop event intact_check_1; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled drop event intact_check_2; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled drop event intact_check; -ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start +ERROR HY000: Cannot proceed, because event scheduler is disabled set global event_scheduler=on; ERROR HY000: Event Scheduler: An error occurred when initializing system tables. Disabling the Event Scheduler. set global event_scheduler=off; diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 14662c0eb38..43d63fd705a 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -5972,8 +5972,8 @@ ER_EVENT_RECURSION_FORBIDDEN eng "Recursion of EVENT DDL statements is forbidden when body is present" ger "Rekursivität von EVENT-DDL-Anweisungen ist unzulässig wenn ein Hauptteil (Body) existiert" ER_EVENTS_DB_ERROR - eng "Cannot proceed because system tables used by Event Scheduler were found damaged at server start" - ger "Kann nicht weitermachen, weil die Tabellen, die von Events verwendet werden, beim Serverstart als beschädigt markiert wurden" + eng "Cannot proceed, because event scheduler is disabled" + ger "Die Operation kann nicht fortgesetzt werden, da Event Scheduler deaktiviert ist." ER_ONLY_INTEGERS_ALLOWED eng "Only integers allowed as number here" ger "An dieser Stelle sind nur Ganzzahlen zulässig" -- cgit v1.2.1