mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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.
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user