Commit 070c8e74 authored by unknown's avatar unknown
Browse files

Fix for bug#22662 Inconsistent values displayed for event_scheduler 

when set to DISABLED
  
It was a silly ordering number error.



sql/events.h:
  fix ordinal number, the cause for bug #22662
  Inconsistent values displayed for event_scheduler when set to DISABLED
mysql-test/r/events_restart_phase0.result:
  New BitKeeper file ``mysql-test/r/events_restart_phase0.result''
mysql-test/t/events_restart_phase0.log:
  New BitKeeper file ``mysql-test/t/events_restart_phase0.log''
mysql-test/t/events_restart_phase0.result:
  New BitKeeper file ``mysql-test/t/events_restart_phase0.result''
parent 6c9400b9

mysql-test/r/events_restart_phase0.result

0 → 100644
+22 −0
Original line number Diff line number Diff line 
SHOW VARIABLES LIKE 'event%';

Variable_name	Value

event_scheduler	DISABLED

SELECT @@global.event_scheduler;

@@global.event_scheduler

DISABLED

SET GLOBAL event_scheduler=on;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=off;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=0;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=1;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=2;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of '2'

SET GLOBAL event_scheduler=SUSPEND;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPEND'

SET GLOBAL event_scheduler=SUSPENDED;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPENDED'

SET GLOBAL event_scheduler=disabled;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'

mysql-test/t/events_restart_phase0.log

0 → 100644
+22 −0
Original line number Diff line number Diff line 
SHOW VARIABLES LIKE 'event%';

Variable_name	Value

event_scheduler	DISABLED

SELECT @@global.event_scheduler;

@@global.event_scheduler

DISABLED

SET GLOBAL event_scheduler=on;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=off;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=0;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=1;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=2;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of '2'

SET GLOBAL event_scheduler=SUSPEND;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPEND'

SET GLOBAL event_scheduler=SUSPENDED;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPENDED'

SET GLOBAL event_scheduler=disabled;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'

mysql-test/t/events_restart_phase0.result

0 → 100644
+22 −0
Original line number Diff line number Diff line 
SHOW VARIABLES LIKE 'event%';

Variable_name	Value

event_scheduler	DISABLED

SELECT @@global.event_scheduler;

@@global.event_scheduler

DISABLED

SET GLOBAL event_scheduler=on;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=off;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=0;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=1;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=2;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of '2'

SET GLOBAL event_scheduler=SUSPEND;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPEND'

SET GLOBAL event_scheduler=SUSPENDED;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPENDED'

SET GLOBAL event_scheduler=disabled;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'

sql/events.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class Events 
  {

    EVENTS_OFF= 0,

    EVENTS_ON= 1,

    EVENTS_DISABLED= 5

    EVENTS_DISABLED= 4

  };



  static enum_opt_event_scheduler opt_event_scheduler;