Skip to content

Commit

Permalink
Remove dead code added in merge commit d8b45b0
Browse files Browse the repository at this point in the history
In a merge conflict resolution, callers of the added function
rec_field_len_in_chars() were removed, but the function itself was not.
  • Loading branch information
dr-m committed May 19, 2017
1 parent 546a89c commit 335c4ab
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions storage/xtradb/row/row0sel.cc
Expand Up @@ -3646,30 +3646,6 @@ row_search_idx_cond_check(
return(result); return(result);
} }



/** Return the record field length in characters.
@param[in] col table column of the field
@param[in] field_no field number
@param[in] rec physical record
@param[in] offsets field offsets in the physical record
@return field length in characters */
static
size_t
rec_field_len_in_chars(const dict_col_t &col,
const ulint field_no,
const rec_t *rec,
const ulint *offsets)
{
const ulint cset = dtype_get_charset_coll(col.prtype);
const CHARSET_INFO* cs = all_charsets[cset];
ulint rec_field_len;
const char* rec_field = reinterpret_cast<const char *>(
rec_get_nth_field(
rec, offsets, field_no, &rec_field_len));
return(cs->cset->numchars(cs, rec_field, rec_field + rec_field_len));
}

/********************************************************************//** /********************************************************************//**
Searches for rows in the database. This is used in the interface to Searches for rows in the database. This is used in the interface to
MySQL. This function opens a cursor, and also implements fetch next MySQL. This function opens a cursor, and also implements fetch next
Expand Down

0 comments on commit 335c4ab

Please sign in to comment.