summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-06-07 09:31:11 +0200
committerunknown <knielsen@knielsen-hq.org>2013-06-07 09:31:11 +0200
commitdbe2c5060edec13d591d176df08d0fc07c3aa6dd (patch)
treecad304799b2c4a53b41b71985ce83ab9d2f1c192 /sql/share
parent7b6ab5638ac8bd4bb604e3c39d5f21218ab17688 (diff)
downloadmariadb-git-dbe2c5060edec13d591d176df08d0fc07c3aa6dd.tar.gz
MDEV-4591:Setting gtid* values from inside a transaction might cause unexpected results
Now we give an error on attempts to set @@SESSION.gtid_domain_id or @@SESSION.gtid_seq_no when a transaction is active.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 9acdda3b78b..48809417a6c 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6551,3 +6551,7 @@ ER_GTID_START_FROM_BINLOG_HOLE
eng "The binlog on the master is missing the GTID %u-%u-%llu requested by the slave (even though both a prior and a subsequent sequence number does exist), and GTID strict mode is enabled"
ER_SLAVE_UNEXPECTED_MASTER_SWITCH
eng "Unexpected GTID received from master after reconnect. This normally indicates that the master server was replaced without restarting the slave threads. %s"
+ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO
+ eng "Cannot modify @@session.gtid_domain_id or @@session.gtid_seq_no inside a transaction"
+ER_STORED_FUNCTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO
+ eng "Cannot modify @@session.gtid_domain_id or @@session.gtid_seq_no inside a stored function or trigger"