1
0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00

After-merge fix.

This commit is contained in:
Kristian Nielsen
2016-01-15 14:24:11 +01:00
parent 2f88b14acd
commit 38bcb4464e

View File

@@ -4489,8 +4489,7 @@ 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)
if (mi->using_gtid != Master_info::USE_GTID_NO && mi->using_parallel())
{
ulong domain_count;
mysql_mutex_lock(&rpl_global_gtid_slave_state->LOCK_slave_state);