diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-06 15:39:15 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-26 15:43:46 +0300 |
| commit | df4dd593f29aec8e2116aec1775ad4b8833d8c93 (patch) | |
| tree | becae67f02054e15ead58e929e91c044f0b7aa15 /sql/event_data_objects.cc | |
| parent | e974b564389af8251c2ba51060e6129e45431586 (diff) | |
| download | mariadb-git-df4dd593f29aec8e2116aec1775ad4b8833d8c93.tar.gz | |
MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3879.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
Diffstat (limited to 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index d65180a60be..26d2e1ef985 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1472,8 +1472,25 @@ end: bool save_tx_read_only= thd->tx_read_only; thd->tx_read_only= false; +#ifdef WITH_WSREP + 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 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 = saved; + } +#endif + ret= Events::drop_event(thd, dbname, name, FALSE); + WSREP_TO_ISOLATION_END; + + error: thd->tx_read_only= save_tx_read_only; thd->security_ctx->master_access= saved_master_access; } |