mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +01:00
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.
This commit is contained in:
parent
cef74ef732
commit
eb02061cdf
1 changed files with 6 additions and 6 deletions
|
@ -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(
|
||||||
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))) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue