diff options
Diffstat (limited to 'storage/innobase/include/data0data.ic')
| -rw-r--r-- | storage/innobase/include/data0data.ic | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/storage/innobase/include/data0data.ic b/storage/innobase/include/data0data.ic index da50e91e98d..6937d55d211 100644 --- a/storage/innobase/include/data0data.ic +++ b/storage/innobase/include/data0data.ic @@ -54,7 +54,7 @@ void dfield_set_type( /*============*/ dfield_t* field, /*!< in: SQL data field */ - dtype_t* type) /*!< in: pointer to data type struct */ + const dtype_t* type) /*!< in: pointer to data type struct */ { ut_ad(field && type); @@ -407,6 +407,8 @@ dtuple_create_from_mem( } } #endif + UNIV_MEM_ASSERT_W(tuple->fields, n_fields * sizeof *tuple->fields); + UNIV_MEM_INVALID(tuple->fields, n_fields * sizeof *tuple->fields); return(tuple); } @@ -434,30 +436,6 @@ dtuple_create( tuple = dtuple_create_from_mem(buf, buf_size, n_fields); -#ifdef UNIV_DEBUG - UNIV_MEM_INVALID(tuple->fields, n_fields * sizeof *tuple->fields); -#endif - - return(tuple); -} - -/**********************************************************//** -Wrap data fields in a tuple. The default value for number -of fields used in record comparisons for this tuple is n_fields. -@return data tuple */ -UNIV_INLINE -const dtuple_t* -dtuple_from_fields( -/*===============*/ - dtuple_t* tuple, /*!< in: storage for data tuple */ - const dfield_t* fields, /*!< in: fields */ - ulint n_fields) /*!< in: number of fields */ -{ - tuple->info_bits = 0; - tuple->n_fields = tuple->n_fields_cmp = n_fields; - tuple->fields = (dfield_t*) fields; - ut_d(tuple->magic_n = DATA_TUPLE_MAGIC_N); - return(tuple); } |