mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'mariadb-10.0.24' into 10.0-galera

Browse source
This commit is contained in:
Nirbhay Choubey 2016-02-23 20:53:29 -05:00
commit 0d58323e26
305 changed files with 9178 additions and 4280 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sql/sys_vars.cc
View file

@ -4356,6 +4356,29 @@ static bool update_slave_skip_counter(sys_var *self, THD *thd, Master_info *mi)
mi->connection_name.str);
return true;
}
if (mi->using_gtid != Master_info::USE_GTID_NO &&
opt_slave_parallel_threads > 0)
{
ulong domain_count;
mysql_mutex_lock(&rpl_global_gtid_slave_state->LOCK_slave_state);
domain_count= rpl_global_gtid_slave_state->count();
mysql_mutex_unlock(&rpl_global_gtid_slave_state->LOCK_slave_state);
if (domain_count > 1)
{
/*
With domain-based parallel replication, the slave position is
multi-dimensional, so the relay log position is not very meaningful.
It might not even correspond to the next GTID to execute in _any_
domain (the case after error stop). So slave_skip_counter will most
likely not do what the user intends. Instead give an error, with a
suggestion to instead set @@gtid_slave_pos past the point of error;
this works reliably also in the case of multiple domains.
*/
my_error(ER_SLAVE_SKIP_NOT_IN_GTID, MYF(0));
return true;
}
}
/* The value was stored temporarily in thd */
mi->rli.slave_skip_counter= thd->variables.slave_skip_counter;
return false;