database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2017-04-28 12:22:32 +03:00
parent e21c15a7e6 97e0c260dc
commit f740d23ce6
152 changed files with 4678 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/rpl_parallel.cc
View File

@ -1164,7 +1164,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,