summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-03-21 12:16:04 +0100
committerunknown <knielsen@knielsen-hq.org>2013-03-21 12:16:04 +0100
commite590f89114bd205e30488cb8b1433f645babc170 (patch)
treee3ca77b7411c50a2a9655b6742f89c8294c09497 /sql/item_func.cc
parent9bb989a9d196755fe411551f27e6198ef6819159 (diff)
downloadmariadb-git-e590f89114bd205e30488cb8b1433f645babc170.tar.gz
MDEV-26: Global transaction ID.
Fix MDEV-4278: Slave does not check that master understands GTID. Now the slave will abort with a suitable error if an attempt is made to connect with GTID to a master that does not support GTID.
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 8b4e5542a1f..7fd3ba56f50 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -5678,6 +5678,14 @@ longlong Item_func_get_system_var::val_int()
{
THD *thd= current_thd;
+ DBUG_EXECUTE_IF("simulate_non_gtid_aware_master",
+ {
+ if (0 == strcmp("gtid_domain_id", var->name.str))
+ {
+ my_error(ER_VAR_CANT_BE_READ, MYF(0), var->name.str);
+ return 0;
+ }
+ });
if (cache_present && thd->query_id == used_query_id)
{
if (cache_present & GET_SYS_VAR_CACHE_LONG)