After-merge fix.

knielsen · knielsen · commit 38bcb4464ead · 2016-01-15T14:24:11.000+01:00
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -4489,8 +4489,7 @@ static bool update_slave_skip_counter(sys_var self, THD thd, Master_info *mi)`
`4489`	`4489`	`mi->connection_name.str);`
`4490`	`4490`	`return true;`
`4491`	`4491`	`}`
`4492`		`- if (mi->using_gtid != Master_info::USE_GTID_NO &&`
`4493`		`- opt_slave_parallel_threads > 0)`
	`4492`	`+ if (mi->using_gtid != Master_info::USE_GTID_NO && mi->using_parallel())`
`4494`	`4493`	`{`
`4495`	`4494`	`ulong domain_count;`
`4496`	`4495`	`mysql_mutex_lock(&rpl_global_gtid_slave_state->LOCK_slave_state);`