diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-27 16:26:00 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-27 16:26:00 -0400 |
| commit | 02ba2bfdb444531e6fe61716a4eaeab40e210bbd (patch) | |
| tree | 0b67ad5b8f6e8a901ed2b6cac8d4692d8db8f112 /storage/xtradb/row/row0upd.cc | |
| parent | 09e3094945694277a550cccc8bd1fd11338474b1 (diff) | |
| parent | c5f7486654d7fd4941b202735799f9a7ec3c15eb (diff) | |
| download | mariadb-git-02ba2bfdb444531e6fe61716a4eaeab40e210bbd.tar.gz | |
Merging revision from codership-mysql/5.5 (r3928..3968) and
codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.
Diffstat (limited to 'storage/xtradb/row/row0upd.cc')
| -rw-r--r-- | storage/xtradb/row/row0upd.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/xtradb/row/row0upd.cc b/storage/xtradb/row/row0upd.cc index 9b733410c00..0f299228493 100644 --- a/storage/xtradb/row/row0upd.cc +++ b/storage/xtradb/row/row0upd.cc @@ -375,6 +375,8 @@ wsrep_row_upd_check_foreign_constraints( trx = thr_get_trx(thr); + /* TODO: make native slave thread bail out here */ + rec = btr_pcur_get_rec(pcur); ut_ad(rec_offs_validate(rec, index, offsets)); |