diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 08:53:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 12:29:37 +0300 |
| commit | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (patch) | |
| tree | b13da72226623745f0607609e2bb3dcaac4a11c6 /storage/xtradb/handler/ha_innodb.h | |
| parent | d0eb4ee96b32caec1d6bba6dc376016b2bf2ac0f (diff) | |
| parent | 54bb04f7efc1d0842b3d8befb670f5d9f05cb211 (diff) | |
| download | mariadb-git-13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/xtradb/handler/ha_innodb.h')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.h b/storage/xtradb/handler/ha_innodb.h index 62b80c492a1..426136e4d51 100644 --- a/storage/xtradb/handler/ha_innodb.h +++ b/storage/xtradb/handler/ha_innodb.h @@ -540,7 +540,7 @@ innobase_index_name_is_reserved( const KEY* key_info, /*!< in: Indexes to be created */ ulint num_of_keys) /*!< in: Number of indexes to be created. */ - MY_ATTRIBUTE((nonnull, warn_unused_result)); + MY_ATTRIBUTE((nonnull(1), warn_unused_result)); /*****************************************************************//** #ifdef WITH_WSREP |