mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
branches/innodb+: Non-functional change:
ibuf_rec_get_counter(): Rename from ibuf_rec_get_fake_counter(). There is nothing fake about the counter. Also add const qualifiers to the pointers.
This commit is contained in:
parent
d22a9e2b71
commit
365402d771
3 changed files with 14 additions and 12 deletions
|
@ -708,7 +708,7 @@ retry_page_get:
|
|||
& REC_INFO_MIN_REC_FLAG;
|
||||
|
||||
if (!is_min_rec) {
|
||||
cursor->ibuf_cnt = ibuf_rec_get_fake_counter(node_ptr);
|
||||
cursor->ibuf_cnt = ibuf_rec_get_counter(node_ptr);
|
||||
|
||||
ut_a(cursor->ibuf_cnt <= 0xFFFF
|
||||
|| cursor->ibuf_cnt == ULINT_UNDEFINED);
|
||||
|
|
|
@ -1227,13 +1227,14 @@ Read the first two bytes from a record's fourth field (counter field in new
|
|||
records; something else in older records). */
|
||||
UNIV_INTERN
|
||||
ulint
|
||||
ibuf_rec_get_fake_counter(
|
||||
/*======================*/
|
||||
/* out: "counter" field, or ULINT_UNDEFINED if for
|
||||
some reason it can't be read*/
|
||||
rec_t* rec) /* in: ibuf record */
|
||||
ibuf_rec_get_counter(
|
||||
/*=================*/
|
||||
/* out: "counter" field,
|
||||
or ULINT_UNDEFINED if for
|
||||
some reason it can't be read */
|
||||
const rec_t* rec) /* in: ibuf record */
|
||||
{
|
||||
byte* ptr;
|
||||
const byte* ptr;
|
||||
ulint len;
|
||||
|
||||
if (rec_get_n_fields_old(rec) < 4) {
|
||||
|
|
|
@ -337,11 +337,12 @@ Read the first two bytes from a record's fourth field (counter field in new
|
|||
records; something else in older records). */
|
||||
UNIV_INTERN
|
||||
ulint
|
||||
ibuf_rec_get_fake_counter(
|
||||
/*======================*/
|
||||
/* out: "counter" field, or ULINT_UNDEFINED if for
|
||||
some reason it can't be read*/
|
||||
rec_t* rec); /* in: ibuf record */
|
||||
ibuf_rec_get_counter(
|
||||
/*=================*/
|
||||
/* out: "counter" field,
|
||||
or ULINT_UNDEFINED if for
|
||||
some reason it can't be read */
|
||||
const rec_t* rec); /* in: ibuf record */
|
||||
|
||||
#define IBUF_HEADER_PAGE_NO FSP_IBUF_HEADER_PAGE_NO
|
||||
#define IBUF_TREE_ROOT_PAGE_NO FSP_IBUF_TREE_ROOT_PAGE_NO
|
||||
|
|
Loading…
Reference in a new issue