From 335c4ab790254462753ba4ed8b074c5847b2708f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 19 May 2017 09:51:44 +0300 Subject: Remove dead code added in merge commit d8b45b0c004edc0b91029b232d7cc9aad02cc822 In a merge conflict resolution, callers of the added function rec_field_len_in_chars() were removed, but the function itself was not. --- storage/xtradb/row/row0sel.cc | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'storage/xtradb/row') diff --git a/storage/xtradb/row/row0sel.cc b/storage/xtradb/row/row0sel.cc index 17920c91743..b0c6565ab2e 100644 --- a/storage/xtradb/row/row0sel.cc +++ b/storage/xtradb/row/row0sel.cc @@ -3646,30 +3646,6 @@ row_search_idx_cond_check( 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( - 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 MySQL. This function opens a cursor, and also implements fetch next -- cgit v1.2.1