diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:21:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:21:03 +0200 |
| commit | 720e04ff6760e9d04566d7fb33131fd1886ef4cd (patch) | |
| tree | 17cd54888d796e976e571d5873e3d3f051436a06 /storage/innobase/data | |
| parent | f1aae861eee711cc718ca8fe52cc08d326b948cf (diff) | |
| download | mariadb-git-720e04ff6760e9d04566d7fb33131fd1886ef4cd.tar.gz | |
5.6.31
Diffstat (limited to 'storage/innobase/data')
| -rw-r--r-- | storage/innobase/data/data0data.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/data/data0data.cc b/storage/innobase/data/data0data.cc index 179de79b69f..593af089b00 100644 --- a/storage/innobase/data/data0data.cc +++ b/storage/innobase/data/data0data.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2012, 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 @@ -67,7 +67,8 @@ dtuple_coll_cmp( ulint n_fields; ulint i; - ut_ad(tuple1 && tuple2); + ut_ad(tuple1 != NULL); + ut_ad(tuple2 != NULL); ut_ad(tuple1->magic_n == DATA_TUPLE_MAGIC_N); ut_ad(tuple2->magic_n == DATA_TUPLE_MAGIC_N); ut_ad(dtuple_check_typed(tuple1)); @@ -715,7 +716,7 @@ UNIV_INTERN void dtuple_convert_back_big_rec( /*========================*/ - dict_index_t* index __attribute__((unused)), /*!< in: index */ + dict_index_t* index MY_ATTRIBUTE((unused)), /*!< in: index */ dtuple_t* entry, /*!< in: entry whose data was put to vector */ big_rec_t* vector) /*!< in, own: big rec vector; it is freed in this function */ |