MDEV-6340 Mariadb 10.0.12 fatal "Lost connection" error w/ GCC 4.9 'R…

…elease' build; workaround ~ CFLAGS="-fno-delete-null-pointer-checks" don't use attribute nonnull for arguments that can be null
MariaDB · Jul 31, 2014 · 3e9d454 · 3e9d454
1 parent c253676
commit 3e9d454
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
@@ -289,7 +289,7 @@ lock_rec_insert_check_and_lock(
 				inserted record maybe should inherit
 				LOCK_GAP type locks from the successor
 				record */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((nonnull(2,3,4,6,7), warn_unused_result));
 /*********************************************************************//**
 Checks if locks of other transactions prevent an immediate modify (update,
 delete mark, or delete unmark) of a clustered index record. If they do,

diff --git a/storage/xtradb/include/lock0lock.h b/storage/xtradb/include/lock0lock.h
@@ -291,7 +291,7 @@ lock_rec_insert_check_and_lock(
 				inserted record maybe should inherit
 				LOCK_GAP type locks from the successor
 				record */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((nonnull(2,3,4,6,7), warn_unused_result));
 /*********************************************************************//**
 Checks if locks of other transactions prevent an immediate modify (update,
 delete mark, or delete unmark) of a clustered index record. If they do,