diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:58:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:58:19 +0200 |
| commit | a79d46c3a4839fa15c9f78dc2d5858ef948add18 (patch) | |
| tree | 1411394a02293e91c8b1d75b3c87cc4724b899d2 /storage/innobase/include/rem0cmp.h | |
| parent | c081c978a2c83b9dc9efa84414cf40232460987d (diff) | |
| parent | 720e04ff6760e9d04566d7fb33131fd1886ef4cd (diff) | |
| download | mariadb-git-a79d46c3a4839fa15c9f78dc2d5858ef948add18.tar.gz | |
Merge branch 'merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/include/rem0cmp.h')
| -rw-r--r-- | storage/innobase/include/rem0cmp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h index cb3c85ac2c8..65116229fdc 100644 --- a/storage/innobase/include/rem0cmp.h +++ b/storage/innobase/include/rem0cmp.h @@ -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 @@ -174,7 +174,7 @@ cmp_dtuple_rec_with_match_low( bytes within the first field not completely matched; when function returns, contains the value for current comparison */ - __attribute__((nonnull)); + MY_ATTRIBUTE((nonnull)); #define cmp_dtuple_rec_with_match(tuple,rec,offsets,fields,bytes) \ cmp_dtuple_rec_with_match_low( \ tuple,rec,offsets,dtuple_get_n_fields_cmp(tuple),fields,bytes) @@ -218,7 +218,7 @@ cmp_rec_rec_simple( struct TABLE* table) /*!< in: MySQL table, for reporting duplicate key value if applicable, or NULL */ - __attribute__((nonnull(1,2,3,4), warn_unused_result)); + MY_ATTRIBUTE((nonnull(1,2,3,4), warn_unused_result)); /*************************************************************//** This function is used to compare two physical records. Only the common first fields are compared, and if an externally stored field is |