diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-12-29 12:09:23 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-12-29 12:09:23 +0200 |
| commit | 44728324f0abe3e327fc2095a99e647b1c44dd8d (patch) | |
| tree | 731c3470a5161bf46ef2e8824387f2707ac13bc1 /innobase/trx | |
| parent | 59b274eab8ff97461f7c88f9f0e347a35deb9842 (diff) | |
| download | mariadb-git-44728324f0abe3e327fc2095a99e647b1c44dd8d.tar.gz | |
InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464)
innobase/dict/dict0dict.c:
Make dict_is_mixed_table_rec() a non-inlined function.
innobase/include/dict0dict.h:
Make dict_is_mixed_table_rec() a non-inlined function.
Remove dict_index_rec_get_sys_col().
innobase/include/dict0dict.ic:
Make dict_is_mixed_table_rec() a non-inlined function.
Remove dict_index_rec_get_sys_col().
innobase/trx/trx0rec.c:
Replace the two calls to the removed
function dict_index_rec_get_sys_col() with equivalent code.
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0rec.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c index 12a0512da53..90ecb217c1d 100644 --- a/innobase/trx/trx0rec.c +++ b/innobase/trx/trx0rec.c @@ -485,10 +485,15 @@ trx_undo_page_report_modify( ptr += 1; /* Store the values of the system columns */ - trx_id = dict_index_rec_get_sys_col(index, offsets, - DATA_TRX_ID, rec); - roll_ptr = dict_index_rec_get_sys_col(index, offsets, - DATA_ROLL_PTR, rec); + field = rec_get_nth_field(rec, offsets, + dict_index_get_sys_col_pos(index, DATA_TRX_ID), &len); + ut_ad(len == DATA_TRX_ID_LEN); + trx_id = trx_read_trx_id(field); + field = rec_get_nth_field(rec, offsets, + dict_index_get_sys_col_pos(index, DATA_ROLL_PTR), &len); + ut_ad(len == DATA_ROLL_PTR_LEN); + roll_ptr = trx_read_roll_ptr(field); + len = mach_dulint_write_compressed(ptr, trx_id); ptr += len; |