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/mtr0mtr.ic | |
| 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/mtr0mtr.ic')
| -rw-r--r-- | storage/innobase/include/mtr0mtr.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic index 44d548e9b64..37cea34d4eb 100644 --- a/storage/innobase/include/mtr0mtr.ic +++ b/storage/innobase/include/mtr0mtr.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 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 @@ -37,7 +37,7 @@ ibool mtr_block_dirtied( /*==============*/ const buf_block_t* block) /*!< in: block being x-fixed */ - __attribute__((nonnull,warn_unused_result)); + MY_ATTRIBUTE((nonnull,warn_unused_result)); /***************************************************************//** Starts a mini-transaction. */ |