Commit 365402d7 authored by marko's avatar marko

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.
parent d22a9e2b
...@@ -708,7 +708,7 @@ btr_cur_search_to_nth_level( ...@@ -708,7 +708,7 @@ btr_cur_search_to_nth_level(
& REC_INFO_MIN_REC_FLAG; & REC_INFO_MIN_REC_FLAG;
if (!is_min_rec) { 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 ut_a(cursor->ibuf_cnt <= 0xFFFF
|| cursor->ibuf_cnt == ULINT_UNDEFINED); || cursor->ibuf_cnt == ULINT_UNDEFINED);
......
...@@ -1227,13 +1227,14 @@ Read the first two bytes from a record's fourth field (counter field in new ...@@ -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). */ records; something else in older records). */
UNIV_INTERN UNIV_INTERN
ulint ulint
ibuf_rec_get_fake_counter( ibuf_rec_get_counter(
/*======================*/ /*=================*/
/* out: "counter" field, or ULINT_UNDEFINED if for /* out: "counter" field,
some reason it can't be read*/ or ULINT_UNDEFINED if for
rec_t* rec) /* in: ibuf record */ some reason it can't be read */
const rec_t* rec) /* in: ibuf record */
{ {
byte* ptr; const byte* ptr;
ulint len; ulint len;
if (rec_get_n_fields_old(rec) < 4) { 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 ...@@ -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). */ records; something else in older records). */
UNIV_INTERN UNIV_INTERN
ulint ulint
ibuf_rec_get_fake_counter( ibuf_rec_get_counter(
/*======================*/ /*=================*/
/* out: "counter" field, or ULINT_UNDEFINED if for /* out: "counter" field,
some reason it can't be read*/ or ULINT_UNDEFINED if for
rec_t* rec); /* in: ibuf record */ 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_HEADER_PAGE_NO FSP_IBUF_HEADER_PAGE_NO
#define IBUF_TREE_ROOT_PAGE_NO FSP_IBUF_TREE_ROOT_PAGE_NO #define IBUF_TREE_ROOT_PAGE_NO FSP_IBUF_TREE_ROOT_PAGE_NO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment