=== modified file 'storage/innobase/include/lock0lock.h'
--- storage/innobase/include/lock0lock.h	2014-01-22 08:57:29 +0000
+++ storage/innobase/include/lock0lock.h	2014-11-13 19:22:33 +0000
@@ -289,7 +289,7 @@
 				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,

=== modified file 'storage/innobase/lock/lock0lock.cc'
--- storage/innobase/lock/lock0lock.cc	2014-07-14 06:06:43 +0000
+++ storage/innobase/lock/lock0lock.cc	2014-11-13 19:22:33 +0000
@@ -5912,6 +5912,7 @@
 	ut_ad(!dict_index_is_online_ddl(index)
 	      || dict_index_is_clust(index)
 	      || (flags & BTR_CREATE_FLAG));
+	ut_ad((flags & BTR_NO_LOCKING_FLAG) || thr);
 
 	if (flags & BTR_NO_LOCKING_FLAG) {