Skip to content

Commit 6c9a6ba

Browse files
committed
MDEV-19262 Server error message is unclear if event is created and event_scheduler = DISABLED
Change error message.
1 parent e116f11 commit 6c9a6ba

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

mysql-test/r/events_restart.result

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ select @@event_scheduler;
2020
@@event_scheduler
2121
OFF
2222
show events;
23-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
23+
ERROR HY000: Cannot proceed, because event scheduler is disabled
2424
select event_name from information_schema.events;
25-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
25+
ERROR HY000: Cannot proceed, because event scheduler is disabled
2626
show create event intact_check;
27-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
27+
ERROR HY000: Cannot proceed, because event scheduler is disabled
2828
drop event no_such_event;
29-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
29+
ERROR HY000: Cannot proceed, because event scheduler is disabled
3030
create event intact_check_1 on schedule every 5 hour do select 5;
31-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
31+
ERROR HY000: Cannot proceed, because event scheduler is disabled
3232
alter event intact_check_1 on schedule every 8 hour do select 8;
33-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
33+
ERROR HY000: Cannot proceed, because event scheduler is disabled
3434
alter event intact_check_1 rename to intact_check_2;
35-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
35+
ERROR HY000: Cannot proceed, because event scheduler is disabled
3636
drop event intact_check_1;
37-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
37+
ERROR HY000: Cannot proceed, because event scheduler is disabled
3838
drop event intact_check_2;
39-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
39+
ERROR HY000: Cannot proceed, because event scheduler is disabled
4040
drop event intact_check;
41-
ERROR HY000: Cannot proceed because system tables used by Event Scheduler were found damaged at server start
41+
ERROR HY000: Cannot proceed, because event scheduler is disabled
4242
set global event_scheduler=on;
4343
ERROR HY000: Event Scheduler: An error occurred when initializing system tables. Disabling the Event Scheduler.
4444
set global event_scheduler=off;

sql/share/errmsg-utf8.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5972,8 +5972,8 @@ ER_EVENT_RECURSION_FORBIDDEN
59725972
eng "Recursion of EVENT DDL statements is forbidden when body is present"
59735973
ger "Rekursivität von EVENT-DDL-Anweisungen ist unzulässig wenn ein Hauptteil (Body) existiert"
59745974
ER_EVENTS_DB_ERROR
5975-
eng "Cannot proceed because system tables used by Event Scheduler were found damaged at server start"
5976-
ger "Kann nicht weitermachen, weil die Tabellen, die von Events verwendet werden, beim Serverstart als beschädigt markiert wurden"
5975+
eng "Cannot proceed, because event scheduler is disabled"
5976+
ger "Die Operation kann nicht fortgesetzt werden, da Event Scheduler deaktiviert ist."
59775977
ER_ONLY_INTEGERS_ALLOWED
59785978
eng "Only integers allowed as number here"
59795979
ger "An dieser Stelle sind nur Ganzzahlen zulässig"

0 commit comments

Comments
 (0)