Merge kpdesk.mysql.com:/home/thek/dev/bug26807/my51-bug26807

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

2 files changed, 6 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 83b16d9af0a..1be6f24df45 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3758,6 +3758,7 @@ we force server id to 2, but this MySQL server will not act as a slave.");
     udf_init();
 #endif
   }
+
   init_status_vars();
   if (opt_bootstrap) /* If running with bootstrap, do not start replication. */
     opt_skip_slave_start= 1;
@@ -3804,6 +3805,10 @@ we force server id to 2, but this MySQL server will not act as a slave.");
     if (Events::get_instance()->init())
       unireg_abort(1);
   }
+  else
+  {
+    Events::opt_event_scheduler = Events::EVENTS_DISABLED; 
+  }
 
   /* Signal threads waiting for server to be started */
   pthread_mutex_lock(&LOCK_server_started);
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 91d97b71c1b..a9d2b6541be 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -4000,7 +4000,7 @@ sys_var_event_scheduler::update(THD *thd, set_var *var)
   DBUG_ENTER("sys_var_event_scheduler::update");
   if (Events::opt_event_scheduler == Events::EVENTS_DISABLED)
   {
-    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--event-scheduler=DISABLED");
+    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--event-scheduler=DISABLED or --skip-grant-tables");
     DBUG_RETURN(TRUE);
   }