summaryrefslogtreecommitdiff
path: root/sql/events.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-08-07 07:25:15 +0300
committerMichael Widenius <monty@askmonty.org>2012-08-07 07:25:15 +0300
commitb39e6e3d093b45f792959ef06fea1c175263ae1a (patch)
treeb642aba6ff438e50d67a884f4cb5d9c6c3287644 /sql/events.cc
parent0a70eb33d159036c5d3f6929df57c2f18bda8471 (diff)
downloadmariadb-git-b39e6e3d093b45f792959ef06fea1c175263ae1a.tar.gz
Added support of thd->tx_read_only
Moved timestamp handling from all handler::write() methods in the storage engines to handler::ha_write sql/handler.cc: Added PSI_CALL's
Diffstat (limited to 'sql/events.cc')
-rw-r--r--sql/events.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/events.cc b/sql/events.cc
index 8b4bab9e3a6..d403e38d784 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -1055,6 +1055,7 @@ Events::load_events_from_db(THD *thd)
bool ret= TRUE;
uint count= 0;
ulong saved_master_access;
+ bool save_tx_read_only;
DBUG_ENTER("Events::load_events_from_db");
DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
@@ -1067,9 +1068,12 @@ Events::load_events_from_db(THD *thd)
saved_master_access= thd->security_ctx->master_access;
thd->security_ctx->master_access |= SUPER_ACL;
+ save_tx_read_only= thd->tx_read_only;
+ thd->tx_read_only= false;
ret= db_repository->open_event_table(thd, TL_WRITE, &table);
+ thd->tx_read_only= save_tx_read_only;
thd->security_ctx->master_access= saved_master_access;
if (ret)