diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-04-27 13:35:57 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-04-27 13:35:57 +0300 |
| commit | bcd031271fbfc22e662337386e529185fd434fc5 (patch) | |
| tree | b7c37137f44ddb2f9ffb1b6a250581c0970db0d4 /innobase/row | |
| parent | 949112c12a2a74555c5049aa8b82cee87660cbb5 (diff) | |
| download | mariadb-git-bcd031271fbfc22e662337386e529185fd434fc5.tar.gz | |
Remove unused function rec_offs_nth_null().
rec_offs_nth_extern(): Return zero/nonzero instead of FALSE/TRUE.
innobase/row/row0upd.c:
Normalize the return value of rec_offs_nth_extern() to FALSE/TRUE.
Avoid a repeated call to upd_ext_vec_contains().
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0upd.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/innobase/row/row0upd.c b/innobase/row/row0upd.c index c0aa285d7e5..cf2b8db5d32 100644 --- a/innobase/row/row0upd.c +++ b/innobase/row/row0upd.c @@ -815,9 +815,10 @@ row_upd_build_difference_binary( goto skip_compare; } - extern_bit = rec_offs_nth_extern(offsets, i); + extern_bit = upd_ext_vec_contains(ext_vec, n_ext_vec, i); - if (extern_bit != upd_ext_vec_contains(ext_vec, n_ext_vec, i) + if (UNIV_UNLIKELY(extern_bit == + !rec_offs_nth_extern(offsets, i)) || !dfield_data_is_binary_equal(dfield, len, data)) { upd_field = upd_get_nth_field(update, n_diff); @@ -826,12 +827,8 @@ row_upd_build_difference_binary( upd_field_set_field_no(upd_field, i, index, trx); - if (upd_ext_vec_contains(ext_vec, n_ext_vec, i)) { - upd_field->extern_storage = TRUE; - } else { - upd_field->extern_storage = FALSE; - } - + upd_field->extern_storage = extern_bit; + n_diff++; } skip_compare: |