diff options
Diffstat (limited to 'storage/innobase/include/data0data.ic')
| -rw-r--r-- | storage/innobase/include/data0data.ic | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/storage/innobase/include/data0data.ic b/storage/innobase/include/data0data.ic index 81788885aa5..f8689db54ec 100644 --- a/storage/innobase/include/data0data.ic +++ b/storage/innobase/include/data0data.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -43,8 +43,6 @@ dfield_get_type( /*============*/ const dfield_t* field) /*!< in: SQL data field */ { - ut_ad(field); - return((dtype_t*) &(field->type)); } #endif /* UNIV_DEBUG */ @@ -74,7 +72,6 @@ dfield_get_data( /*============*/ const dfield_t* field) /*!< in: field */ { - ut_ad(field); ut_ad((field->len == UNIV_SQL_NULL) || (field->data != &data_error)); @@ -91,7 +88,6 @@ dfield_get_len( /*===========*/ const dfield_t* field) /*!< in: field */ { - ut_ad(field); ut_ad((field->len == UNIV_SQL_NULL) || (field->data != &data_error)); @@ -107,7 +103,6 @@ dfield_set_len( dfield_t* field, /*!< in: field */ ulint len) /*!< in: length or UNIV_SQL_NULL */ { - ut_ad(field); #ifdef UNIV_VALGRIND_DEBUG if (len != UNIV_SQL_NULL) UNIV_MEM_ASSERT_RW(field->data, len); #endif /* UNIV_VALGRIND_DEBUG */ @@ -125,8 +120,6 @@ dfield_is_null( /*===========*/ const dfield_t* field) /*!< in: field */ { - ut_ad(field); - return(field->len == UNIV_SQL_NULL); } @@ -139,9 +132,7 @@ dfield_is_ext( /*==========*/ const dfield_t* field) /*!< in: field */ { - ut_ad(field); ut_ad(!field->ext || field->len >= BTR_EXTERN_FIELD_REF_SIZE); - return(field->ext); } @@ -153,8 +144,6 @@ dfield_set_ext( /*===========*/ dfield_t* field) /*!< in/out: field */ { - ut_ad(field); - field->ext = 1; } @@ -196,8 +185,6 @@ dfield_set_data( const void* data, /*!< in: data */ ulint len) /*!< in: length or UNIV_SQL_NULL */ { - ut_ad(field); - #ifdef UNIV_VALGRIND_DEBUG if (len != UNIV_SQL_NULL) UNIV_MEM_ASSERT_RW(data, len); #endif /* UNIV_VALGRIND_DEBUG */ @@ -215,8 +202,6 @@ dfield_write_mbr( dfield_t* field, /*!< in: field */ const double* mbr) /*!< in: data */ { - ut_ad(field); - #ifdef UNIV_VALGRIND_DEBUG if (len != UNIV_SQL_NULL) UNIV_MEM_ASSERT_RW(data, len); #endif /* UNIV_VALGRIND_DEBUG */ @@ -340,8 +325,6 @@ dtuple_get_info_bits( /*=================*/ const dtuple_t* tuple) /*!< in: tuple */ { - ut_ad(tuple); - return(tuple->info_bits); } @@ -354,8 +337,6 @@ dtuple_set_info_bits( dtuple_t* tuple, /*!< in: tuple */ ulint info_bits) /*!< in: info bits */ { - ut_ad(tuple); - tuple->info_bits = info_bits; } @@ -368,8 +349,6 @@ dtuple_get_n_fields_cmp( /*====================*/ const dtuple_t* tuple) /*!< in: tuple */ { - ut_ad(tuple); - return(tuple->n_fields_cmp); } @@ -383,9 +362,7 @@ dtuple_set_n_fields_cmp( ulint n_fields_cmp) /*!< in: number of fields used in comparisons in rem0cmp.* */ { - ut_ad(tuple); ut_ad(n_fields_cmp <= tuple->n_fields); - tuple->n_fields_cmp = n_fields_cmp; } @@ -398,8 +375,6 @@ dtuple_get_n_fields( /*================*/ const dtuple_t* tuple) /*!< in: tuple */ { - ut_ad(tuple); - return(tuple->n_fields); } @@ -649,7 +624,6 @@ dtuple_get_data_size( ulint i; ulint sum = 0; - ut_ad(tuple); ut_ad(dtuple_check_typed(tuple)); ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N); @@ -683,7 +657,6 @@ dtuple_get_n_ext( ulint n_fields = tuple->n_fields; ulint i; - ut_ad(tuple); ut_ad(dtuple_check_typed(tuple)); ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N); |