diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:31:43 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:31:43 +0200 |
| commit | 53440e2dda8b3f2763914708e074c8e4ada9ec74 (patch) | |
| tree | 381425fda962f997940036d896e636bc166e1021 /storage/innobase/row/row0ftsort.cc | |
| parent | 52778e2e3e69b8e0d1397ca34694e192c8e0f88c (diff) | |
| download | mariadb-git-53440e2dda8b3f2763914708e074c8e4ada9ec74.tar.gz | |
MDEV-17923: Fix the pointer arithmetics
&sys_buf + DATA_TRX_ID_LEN is not &(sys_buf + DATA_TRX_ID_LEN).
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index d5eee7e0727..e87bd1c0261 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1688,12 +1688,12 @@ row_fts_merge_insert( /* Set TRX_ID and ROLL_PTR */ trx_write_trx_id(sys_buf, trx->id); - trx_write_roll_ptr(sys_buf + DATA_TRX_ID_LEN, + trx_write_roll_ptr(&sys_buf[DATA_TRX_ID_LEN], 1ULL << ROLL_PTR_INSERT_FLAG_POS); dfield_set_data(dtuple_get_nth_field(ins_ctx.tuple, 2), - &sys_buf, DATA_TRX_ID_LEN); + sys_buf, DATA_TRX_ID_LEN); dfield_set_data(dtuple_get_nth_field(ins_ctx.tuple, 3), - &sys_buf + DATA_TRX_ID_LEN, DATA_ROLL_PTR_LEN); + &sys_buf[DATA_TRX_ID_LEN], DATA_ROLL_PTR_LEN); ut_d(ins_ctx.aux_index_id = id); |