MDEV-8774: Test innodb.innodb_bug53290 failures on buildbot

Problem was -O2 and __attribute__((nonnull)) when it should have been
__attribute__((nonnull(1,2,3,4,5)))

Author: Jan Lindström

storage/innobase/include/row0merge.h

@@ -395,7 +395,7 @@ row_merge_sort(
 	fil_space_crypt_t*	crypt_data,/*!< in: table crypt data */
 	row_merge_block_t*	crypt_block, /*!< in: crypt buf or NULL */
 	ulint			space)	   /*!< in: space id */
-	__attribute__((nonnull));
+	__attribute__((nonnull(1,2,3,4,5)));
 /*********************************************************************//**
 Allocate a sort buffer.
 @return own: sort buffer */

storage/xtradb/include/row0merge.h

@@ -395,7 +395,7 @@ row_merge_sort(
 	fil_space_crypt_t*	crypt_data,/*!< in: table crypt data */
 	row_merge_block_t*	crypt_block, /*!< in: crypt buf or NULL */
 	ulint			space)	   /*!< in: space id */
-	__attribute__((nonnull));
+	__attribute__((nonnull(1,2,3,4,5)));
 /*********************************************************************//**
 Allocate a sort buffer.
 @return own: sort buffer */