innodb/xtradb: update nonnull attributes to match the new semantics

MariaDB · Feb 17, 2015 · a0e93bc · a0e93bc
1 parent 4da7aa5
commit a0e93bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h
@@ -448,7 +448,7 @@ btr_root_raise_and_insert(
 	const dtuple_t*	tuple,	/*!< in: tuple to insert */
 	ulint		n_ext,	/*!< in: number of externally stored columns */
 	mtr_t*		mtr)	/*!< in: mtr */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((nonnull(2,3,4,7), warn_unused_result));
 /*************************************************************//**
 Reorganizes an index page.
 
@@ -543,7 +543,7 @@ btr_page_split_and_insert(
 	const dtuple_t*	tuple,	/*!< in: tuple to insert */
 	ulint		n_ext,	/*!< in: number of externally stored columns */
 	mtr_t*		mtr)	/*!< in: mtr */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((nonnull(2,3,4,7), warn_unused_result));
 /*******************************************************//**
 Inserts a data tuple to a tree on a non-leaf level. It is assumed
 that mtr holds an x-latch on the tree. */

diff --git a/storage/xtradb/include/btr0btr.h b/storage/xtradb/include/btr0btr.h
@@ -451,7 +451,7 @@ btr_root_raise_and_insert(
 	const dtuple_t*	tuple,	/*!< in: tuple to insert */
 	ulint		n_ext,	/*!< in: number of externally stored columns */
 	mtr_t*		mtr)	/*!< in: mtr */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((nonnull(2,3,4,7), warn_unused_result));
 /*************************************************************//**
 Reorganizes an index page.
 
@@ -546,7 +546,7 @@ btr_page_split_and_insert(
 	const dtuple_t*	tuple,	/*!< in: tuple to insert */
 	ulint		n_ext,	/*!< in: number of externally stored columns */
 	mtr_t*		mtr)	/*!< in: mtr */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((nonnull(2,3,4,7), warn_unused_result));
 /*******************************************************//**
 Inserts a data tuple to a tree on a non-leaf level. It is assumed
 that mtr holds an x-latch on the tree. */