diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 12:24:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 12:46:12 +0300 |
| commit | 8c38147cdd905077cab6f8a919175080e50c4f13 (patch) | |
| tree | 9ca1443fd5bb9b774556a3eb824dafa18555e307 /sql/rpl_parallel.cc | |
| parent | 5136295b21aac41709672c17a5a596f996a27735 (diff) | |
| parent | 87b6df31c4ae97c09dc67e370978112fe39764bb (diff) | |
| download | mariadb-git-8c38147cdd905077cab6f8a919175080e50c4f13.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index ad734c23d48..f05239ce1ba 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1157,7 +1157,8 @@ handle_rpl_parallel_thread(void *arg) thd->wait_for_commit_ptr= &rgi->commit_orderer; - if (opt_gtid_ignore_duplicates) + if (opt_gtid_ignore_duplicates && + rgi->rli->mi->using_gtid != Master_info::USE_GTID_NO) { int res= rpl_global_gtid_slave_state->check_duplicate_gtid(&rgi->current_gtid, |