diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
| commit | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (patch) | |
| tree | daff81c02baa6c2581d6abe3d746b8f35ee44f32 /sql/sql_insert.cc | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| parent | 39df665a3332bd9bfb2529419f534a49cfac388c (diff) | |
| download | mariadb-git-cb86ce60b9bade5ae7712d8f3f74668208ee3fd2.tar.gz | |
Merge MDEV-4506: Parallel replication into 10.0-base.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b21650dc559..008c6e573c6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -848,10 +848,10 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, table->next_number_field=table->found_next_number_field; #ifdef HAVE_REPLICATION - if (thd->rli_slave && + if (thd->rgi_slave && (info.handle_duplicates == DUP_UPDATE) && (table->next_number_field != NULL) && - rpl_master_has_bug(thd->rli_slave, 24432, TRUE, NULL, NULL)) + rpl_master_has_bug(thd->rgi_slave->rli, 24432, TRUE, NULL, NULL)) goto abort; #endif @@ -3510,10 +3510,10 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) table->next_number_field=table->found_next_number_field; #ifdef HAVE_REPLICATION - if (thd->rli_slave && + if (thd->rgi_slave && (info.handle_duplicates == DUP_UPDATE) && (table->next_number_field != NULL) && - rpl_master_has_bug(thd->rli_slave, 24432, TRUE, NULL, NULL)) + rpl_master_has_bug(thd->rgi_slave->rli, 24432, TRUE, NULL, NULL)) DBUG_RETURN(1); #endif |