summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-07 18:54:32 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-07 18:54:53 +0200
commitb4cda8bbbc23dbf8a7d59d06de390ea35695efe7 (patch)
treead1aa7413896ebd782f3a3c5adfc6e7dcef02cd2
parent913e33e423b434712a9d708cd0f0244d2f03cb0b (diff)
downloadmariadb-git-b4cda8bbbc23dbf8a7d59d06de390ea35695efe7.tar.gz
After-merge fix for GCC
GCC does not like MY_ATTRIBUTE((nonnull)) on a reference-to-pointer parameter. clang did not flag an issue wit that.
-rw-r--r--storage/innobase/row/row0merge.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index 8eb720abb40..4f05899c6a1 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -4304,7 +4304,7 @@ row_merge_rename_tables_dict(
@param[in,out] index index
@param[in] add_v new virtual columns added along with add index call
@return DB_SUCCESS or error code */
-MY_ATTRIBUTE((nonnull(1,2,3), warn_unused_result))
+MY_ATTRIBUTE((nonnull(1,2), warn_unused_result))
static
dberr_t
row_merge_create_index_graph(