summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorthek@kpdesk.mysql.com <>2007-03-16 14:57:02 +0100
committerthek@kpdesk.mysql.com <>2007-03-16 14:57:02 +0100
commit218179269fab7227de9f1a603a4786f1120261e1 (patch)
treeae8ffb099aec21edea39f559150d8b7a203720a7 /sql/set_var.cc
parent122aed1991c2c5607d1ce4d76b9135a2761b9981 (diff)
downloadmariadb-git-218179269fab7227de9f1a603a4786f1120261e1.tar.gz
Bug#26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
- Crash occured because Event engine is only initialized if ACLs are used but not properly marked as disabled. - The patch is to mark the Event engine as DISABLED if no ACLs are used to avoid access of uninitialized variables.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 667abc0af18..a77698221ee 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -3990,7 +3990,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);
}