summaryrefslogtreecommitdiff
path: root/storage/xtradb/row/row0sel.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-19 09:51:44 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-19 09:51:44 +0300
commit335c4ab790254462753ba4ed8b074c5847b2708f (patch)
tree6dc17acc15fa6c11c859ef18c24a9c4f76c6153c /storage/xtradb/row/row0sel.cc
parent546a89ca58887ea0d89794f108bc864e05c2f74f (diff)
downloadmariadb-git-335c4ab790254462753ba4ed8b074c5847b2708f.tar.gz
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.
Diffstat (limited to 'storage/xtradb/row/row0sel.cc')
-rw-r--r--storage/xtradb/row/row0sel.cc24
1 files changed, 0 insertions, 24 deletions
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<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
MySQL. This function opens a cursor, and also implements fetch next