diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:55:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:55:45 +0200 |
| commit | 3863e7238066627ebf3c826c5493bbcf9835d1f8 (patch) | |
| tree | 82502183d3b4ad17fba828c807b6557f99e3fb26 /storage/xtradb/rem/rem0rec.cc | |
| parent | e672d3fb326f717c9e9d26f9bf79ea84ce022e6e (diff) | |
| parent | 64752acf72175ce65250f5c15a93b1850e5640d1 (diff) | |
| download | mariadb-git-3863e7238066627ebf3c826c5493bbcf9835d1f8.tar.gz | |
Merge branch 'merge/merge-xtradb-5.6' into 10.0
5.6.31-77.0
Diffstat (limited to 'storage/xtradb/rem/rem0rec.cc')
| -rw-r--r-- | storage/xtradb/rem/rem0rec.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/xtradb/rem/rem0rec.cc b/storage/xtradb/rem/rem0rec.cc index c5cc9f02f04..c4392c2926e 100644 --- a/storage/xtradb/rem/rem0rec.cc +++ b/storage/xtradb/rem/rem0rec.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -241,7 +241,7 @@ rec_get_n_extern_new( Determine the offset to each field in a leaf-page record in ROW_FORMAT=COMPACT. This is a special case of rec_init_offsets() and rec_get_offsets_func(). */ -UNIV_INLINE __attribute__((nonnull)) +UNIV_INLINE MY_ATTRIBUTE((nonnull)) void rec_init_offsets_comp_ordinary( /*===========================*/ @@ -785,7 +785,7 @@ rec_get_nth_field_offs_old( /**********************************************************//** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT. @return total size */ -UNIV_INLINE __attribute__((warn_unused_result, nonnull(1,2))) +UNIV_INLINE MY_ATTRIBUTE((warn_unused_result, nonnull(1,2))) ulint rec_get_converted_size_comp_prefix_low( /*===================================*/ @@ -1130,7 +1130,7 @@ rec_convert_dtuple_to_rec_old( /*********************************************************//** Builds a ROW_FORMAT=COMPACT record out of a data tuple. */ -UNIV_INLINE __attribute__((nonnull)) +UNIV_INLINE MY_ATTRIBUTE((nonnull)) void rec_convert_dtuple_to_rec_comp( /*===========================*/ @@ -1338,7 +1338,9 @@ rec_convert_dtuple_to_rec( { rec_t* rec; - ut_ad(buf && index && dtuple); + ut_ad(buf != NULL); + ut_ad(index != NULL); + ut_ad(dtuple != NULL); ut_ad(dtuple_validate(dtuple)); ut_ad(dtuple_check_typed(dtuple)); |