diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:33:57 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:33:57 -0400 |
| commit | 90ead99572c8168583cb0943792d964cc2a6abd2 (patch) | |
| tree | 715afd1c1bccbca66eee3c3b58f8e6589f53fe37 /storage/innobase | |
| parent | b441c510a7ea731e2da0fa9b4cf3e7f1275f841b (diff) | |
| download | mariadb-git-90ead99572c8168583cb0943792d964cc2a6abd2.tar.gz | |
bzr merge -r3980..3984 codership/5.5
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/row/row0ins.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c index c6525ebcc93..3419297f059 100644 --- a/storage/innobase/row/row0ins.c +++ b/storage/innobase/row/row0ins.c @@ -1696,6 +1696,10 @@ row_ins_scan_sec_index_for_duplicate( mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint* offsets = offsets_; +#ifdef WITH_WSREP + /* appliers don't need dupkey checks */ + if (wsrep_thd_is_BF(thr_get_trx(thr)->mysql_thd, 0)) return(DB_SUCCESS); +#endif /* WITH_WSREP */ rec_offs_init(offsets_); n_unique = dict_index_get_n_unique(index); @@ -1760,10 +1764,6 @@ row_ins_scan_sec_index_for_duplicate( lock_type, block, rec, index, offsets, thr); } else { -#ifdef WITH_WSREP - /* appliers don't need dupkey checks */ - if (!wsrep_thd_is_BF(thr_get_trx(thr)->mysql_thd, 0)) -#endif /* WITH_WSREP */ err = row_ins_set_shared_rec_lock( lock_type, block, rec, index, offsets, thr); } |