diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-12 12:43:56 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-12 12:43:56 -0400 |
| commit | 38f048a013bcb9c73d74c26af9db4cfdf7299d93 (patch) | |
| tree | f5f4fbad9a66b0a5485bb771d8c41753055342fa /sql | |
| parent | 8358dd53b7406deaa9f50ad09b16a86b7e367632 (diff) | |
| download | mariadb-git-38f048a013bcb9c73d74c26af9db4cfdf7299d93.tar.gz | |
bzr merge -r4101..4103 codership/5.6/
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/event_data_objects.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 8f00ace7124..3c5a4a7909b 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1476,11 +1476,12 @@ end: if (WSREP(thd)) { // sql_print_information("sizeof(LEX) = %d", sizeof(struct LEX)); // sizeof(LEX) = 4512, so it's relatively safe to allocate it on stack. - LEX *old_lex= thd->lex, new_lex; - new_lex.sql_command= SQLCOM_DROP_EVENT; - thd->lex= &new_lex; + LEX lex; + LEX* saved = thd->lex; + lex.sql_command = SQLCOM_DROP_EVENT; + thd->lex = &lex; WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); - thd->lex= old_lex; + thd->lex = saved; } #endif |