mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
WL#1034 update
- fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db - fix crash when the following is executed : CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK; (creation works as well as calling P() which creates the event).
This commit is contained in:
@@ -3704,10 +3704,9 @@ end_with_restore_list:
|
||||
|
||||
/* lex->unit.cleanup() is called outside, no need to call it here */
|
||||
} while (0);
|
||||
lex->et->free_sphead_on_delete= true;
|
||||
delete lex->et;
|
||||
delete lex->sphead;
|
||||
lex->et= 0;
|
||||
lex->sphead= 0;
|
||||
break;
|
||||
}
|
||||
case SQLCOM_SHOW_CREATE_EVENT:
|
||||
@@ -5658,6 +5657,7 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
|
||||
}
|
||||
if (thd->lex->et)
|
||||
{
|
||||
thd->lex->et->free_sphead_on_delete= true;
|
||||
delete thd->lex->et;
|
||||
thd->lex->et= NULL;
|
||||
}
|
||||
@@ -5698,6 +5698,7 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
|
||||
}
|
||||
if (thd->lex->et)
|
||||
{
|
||||
thd->lex->et->free_sphead_on_delete= true;
|
||||
delete thd->lex->et;
|
||||
thd->lex->et= NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user