Skip to content

M
mariadb
Commit 38f048a0 authored by Nirbhay Choubey's avatar Nirbhay Choubey
Browse files
Options

bzr merge -r4101..4103 codership/5.6/

parent 8358dd53
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
sql/event_data_objects.cc
View file @ 38f048a0
...@@ -1476,11 +1476,12 @@ end: ...@@ -1476,11 +1476,12 @@ end:
if (WSREP(thd)) { if (WSREP(thd)) {
// sql_print_information("sizeof(LEX) = %d", sizeof(struct LEX)); // sql_print_information("sizeof(LEX) = %d", sizeof(struct LEX));
// sizeof(LEX) = 4512, so it's relatively safe to allocate it on stack. // sizeof(LEX) = 4512, so it's relatively safe to allocate it on stack.
LEX *old_lex= thd->lex, new_lex; LEX lex;
new_lex.sql_command= SQLCOM_DROP_EVENT; LEX* saved = thd->lex;
thd->lex= &new_lex; lex.sql_command = SQLCOM_DROP_EVENT;
thd->lex = &lex;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
thd->lex= old_lex; thd->lex = saved;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7