Commit eb02061c authored by marko's avatar marko

branches/zip: page_cur_rec_field_extends(): Fix compilation errors that

were introduced when reducing the memory footprint of the data dictionary
cache (Bug #20877), around r834.  This function is only compiled if
PAGE_CUR_LE_OR_EXTENDS is defined in page0cur.h.
parent cef74ef7
...@@ -148,13 +148,13 @@ page_cur_rec_field_extends( ...@@ -148,13 +148,13 @@ page_cur_rec_field_extends(
/* out: TRUE if rec field /* out: TRUE if rec field
extends tuple field */ extends tuple field */
const dtuple_t* tuple, /* in: data tuple */ const dtuple_t* tuple, /* in: data tuple */
rec_t* rec, /* in: record */ const rec_t* rec, /* in: record */
const ulint* offsets,/* in: array returned by rec_get_offsets() */ const ulint* offsets,/* in: array returned by rec_get_offsets() */
ulint n) /* in: compare nth field */ ulint n) /* in: compare nth field */
{ {
dtype_t* type; const dtype_t* type;
dfield_t* dfield; const dfield_t* dfield;
byte* rec_f; const byte* rec_f;
ulint rec_f_len; ulint rec_f_len;
ut_ad(rec_offs_validate(rec, NULL, offsets)); ut_ad(rec_offs_validate(rec, NULL, offsets));
...@@ -175,7 +175,7 @@ page_cur_rec_field_extends( ...@@ -175,7 +175,7 @@ page_cur_rec_field_extends(
if (dfield_get_len(dfield) != UNIV_SQL_NULL if (dfield_get_len(dfield) != UNIV_SQL_NULL
&& rec_f_len != UNIV_SQL_NULL && rec_f_len != UNIV_SQL_NULL
&& rec_f_len >= dfield_get_len(dfield) && rec_f_len >= dfield_get_len(dfield)
&& !cmp_data_data_slow(type, && !cmp_data_data_slow(type->mtype, type->prtype,
dfield_get_data(dfield), dfield_get_data(dfield),
dfield_get_len(dfield), dfield_get_len(dfield),
rec_f, dfield_get_len(dfield))) { rec_f, dfield_get_len(dfield))) {
......
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