bk commit into 5.1 tree (andrey:1.2317) BUG#22662

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-25 13:49:19+02:00, andrey@stripped +4 -0
  Fix for bug#22662  Inconsistent values displayed for event_scheduler
  when set to DISABLED
  
  It was a silly ordering number error.

  mysql-test/r/events_restart_phase0.result@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +22 -0
    New BitKeeper file ``mysql-test/r/events_restart_phase0.result''

  mysql-test/r/events_restart_phase0.result@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +0 -0

  mysql-test/t/events_restart_phase0-master.opt@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +1 -0
    New BitKeeper file ``mysql-test/t/events_restart_phase0-master.opt''

  mysql-test/t/events_restart_phase0-master.opt@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +0 -0

  mysql-test/t/events_restart_phase0.test@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +20 -0
    New BitKeeper file ``mysql-test/t/events_restart_phase0.test''

  mysql-test/t/events_restart_phase0.test@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +0 -0

  sql/events.h@stripped, 2006-09-25 13:49:05+02:00, andrey@stripped +1 -1
    fix ordinal number, the cause for bug #22662
    Inconsistent values displayed for event_scheduler when set to DISABLED

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	example.com
# Root:	/work/mysql-5.1-runtime-wl3337-tree4
--- New file ---
+++ mysql-test/r/events_restart_phase0.result	06/09/25 13:49:05
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'

--- New file ---
+++ mysql-test/t/events_restart_phase0-master.opt	06/09/25 13:49:05
--event-scheduler=disabled

--- New file ---
+++ mysql-test/t/events_restart_phase0.test	06/09/25 13:49:05
# Can't test with embedded server that doesn't support grants
-- source include/not_embedded.inc
SHOW VARIABLES LIKE 'event%';
SELECT @@global.event_scheduler;
--error ER_OPTION_PREVENTS_STATEMENT
SET GLOBAL event_scheduler=on;
--error ER_OPTION_PREVENTS_STATEMENT
SET GLOBAL event_scheduler=off;
--error ER_OPTION_PREVENTS_STATEMENT
SET GLOBAL event_scheduler=0;
--error ER_OPTION_PREVENTS_STATEMENT
SET GLOBAL event_scheduler=1;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL event_scheduler=2;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL event_scheduler=SUSPEND;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL event_scheduler=SUSPENDED;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL event_scheduler=disabled;


--- 1.49/sql/events.h	2006-09-25 13:49:52 +02:00
+++ 1.50/sql/events.h	2006-09-25 13:49:52 +02:00
@@ -55,7 +55,7 @@ public:
   {
     EVENTS_OFF= 0,
     EVENTS_ON= 1,
-    EVENTS_DISABLED= 5
+    EVENTS_DISABLED= 4
   };
 
   static enum_opt_event_scheduler opt_event_scheduler;