diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-30 07:31:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-30 07:31:39 +0200 |
| commit | 0ccfdc8eff6371941d07c61c273784cbc350c87e (patch) | |
| tree | eec9ea2d5b702035e8817072b67bb4f991dd699c /storage/innobase/row | |
| parent | 7440e61a64489a7eba9d0384366ab7aad99efe30 (diff) | |
| download | mariadb-git-0ccfdc8eff6371941d07c61c273784cbc350c87e.tar.gz | |
Remove InnoDB wrappers of <string.h> functions
ut_strcmp(), ut_strcpy(), ut_strlen(), ut_memcpy(), ut_memcmp(),
ut_memmove(): Remove. Invoke the standard library functions directly.
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0sel.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc index f0f1206ea82..47a77a74908 100644 --- a/storage/innobase/row/row0sel.cc +++ b/storage/innobase/row/row0sel.cc @@ -2733,7 +2733,7 @@ row_sel_field_store_in_mysql_format_func( } /* Copy the actual data */ - ut_memcpy(dest, data, len); + memcpy(dest, data, len); /* Pad with trailing spaces. */ @@ -3618,7 +3618,7 @@ row_sel_copy_cached_field_for_mysql( len = templ->mysql_col_len; } - ut_memcpy(buf, cache, len); + memcpy(buf, cache, len); } /** Copy used fields from cached row. @@ -3685,7 +3685,7 @@ row_sel_dequeue_cached_row_for_mysql( UNIV_MEM_INVALID(buf, prebuilt->mysql_prefix_len); /* First copy the NULL bits. */ - ut_memcpy(buf, cached_rec, prebuilt->null_bitmap_len); + memcpy(buf, cached_rec, prebuilt->null_bitmap_len); /* Then copy the requested fields. */ for (i = 0; i < prebuilt->n_template; i++) { @@ -3702,7 +3702,7 @@ row_sel_dequeue_cached_row_for_mysql( buf, cached_rec, templ); } } else { - ut_memcpy(buf, cached_rec, prebuilt->mysql_prefix_len); + memcpy(buf, cached_rec, prebuilt->mysql_prefix_len); } prebuilt->n_fetch_cached--; @@ -3785,9 +3785,8 @@ row_sel_enqueue_cache_row_for_mysql( next fetch cache slot. */ if (prebuilt->pk_filter || prebuilt->idx_cond) { - byte* dest = row_sel_fetch_last_buf(prebuilt); - - ut_memcpy(dest, mysql_rec, prebuilt->mysql_row_len); + memcpy(row_sel_fetch_last_buf(prebuilt), mysql_rec, + prebuilt->mysql_row_len); } ++prebuilt->n_fetch_cached; |