diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 20:30:18 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 20:30:18 +0300 |
| commit | 01209de7637a7206c18788e08919b5ccf0b3d700 (patch) | |
| tree | cb436bf0815ce83cda99844a256a0cde359d2f03 /storage/xtradb/row/row0ins.cc | |
| parent | 352d27ce36bc807f0c3c803e192ad1851f7f86a0 (diff) | |
| parent | bbfd53cd32c1cf8be30f1d18225adb7fc5f6faf9 (diff) | |
| download | mariadb-git-01209de7637a7206c18788e08919b5ccf0b3d700.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1
Diffstat (limited to 'storage/xtradb/row/row0ins.cc')
| -rw-r--r-- | storage/xtradb/row/row0ins.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/row/row0ins.cc b/storage/xtradb/row/row0ins.cc index 3a9aa91d52e..33f8ec443dd 100644 --- a/storage/xtradb/row/row0ins.cc +++ b/storage/xtradb/row/row0ins.cc @@ -937,7 +937,7 @@ row_ins_invalidate_query_cache( mem_free(buf); } #ifdef WITH_WSREP -dberr_t wsrep_append_foreign_key(trx_t *trx, +dberr_t wsrep_append_foreign_key(trx_t *trx, dict_foreign_t* foreign, const rec_t* clust_rec, dict_index_t* clust_index, @@ -1464,7 +1464,7 @@ row_ins_check_foreign_constraint( rec_offs_init(offsets_); #ifdef WITH_WSREP - upd_node= NULL; + upd_node= NULL; #endif /* WITH_WSREP */ run_again: #ifdef UNIV_SYNC_DEBUG @@ -1655,7 +1655,7 @@ run_again: err = wsrep_append_foreign_key( thr_get_trx(thr), foreign, - rec, + rec, check_index, check_ref, (upd_node) ? TRUE : FALSE); |