diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 12:00:11 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 12:00:11 +0100 |
| commit | 57a267a8c00471bbe13724e7d9ba89d23acef3c2 (patch) | |
| tree | 808a9f9b165bfe034304e4974dd618eaafcdedb2 /sql/sql_insert.cc | |
| parent | bd3dc54261f10f387a03ad99ce74c3824c42e462 (diff) | |
| parent | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (diff) | |
| download | mariadb-git-57a267a8c00471bbe13724e7d9ba89d23acef3c2.tar.gz | |
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
The merge is still missing a few hunks related to temporary tables and
InnoDB log file size. The associated code did not seem to exist in
10.0, so the merge of that needs more work. Until this is fixed, there
are a number of test failures as a result.
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 4e352b33e38..0acb7e747ad 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -853,10 +853,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 @@ -3509,10 +3509,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 |