Merge lp:~laurynas-biveinis/percona-server/bug1390695 into lp:percona-server/5.6

[Laurynas Biveinis]

Fix bug 1390695 (percona 5.6.21-70.0 crash on data import) by fixing
the upstream bug http://bugs.mysql.com/bug.php?id=74842 (Incorrect
attribute((nonnull)) for btr_cur_ins_lock_and_undo callees)

The crash in the Percona Server bug is happening because a thr != NULL
check after the btr_cur_ins_lock_and_undo call is getting optimized
away, while NULL is a legal value for thr there. The cause for this is
the upstream bug: lock_rec_insert_check_and_lock is incorectly
annotated with attribute((nonnull)), applying to its thr arg. Thus,
after returning from the call, the compiler assumes that thr must be
!= NULL.

Fix by correcting the attribute((nonnull)) annotations for
lock_rec_insert_check_and_lock and trx_undo_report_row_operation not
to say that thr must be nonnull.

http://jenkins.percona.com/job/percona-server-5.6-param/755/

[Laurynas Biveinis (laurynas-biveinis)]

No new MTR testcase needed: the bug makes the existing ones (e.g. innodb.innodb) fail.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'storage/innobase/include/lock0lock.h'
--- storage/innobase/include/lock0lock.h	2014-06-04 14:48:06 +0000
+++ storage/innobase/include/lock0lock.h	2014-11-14 09:43:56 +0000
@@ -291,7 +291,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/include/trx0rec.h'
--- storage/innobase/include/trx0rec.h	2013-08-06 15:16:34 +0000
+++ storage/innobase/include/trx0rec.h	2014-11-14 09:43:56 +0000
@@ -233,7 +233,7 @@
 					inserted undo log record,
 					0 if BTR_NO_UNDO_LOG
 					flag was specified */
-	__attribute__((nonnull(3,4,10), warn_unused_result));
+	__attribute__((nonnull(4,10), warn_unused_result));
 /******************************************************************//**
 Copies an undo record to heap. This function can be called if we know that
 the undo log record exists.
 
=== modified file 'storage/innobase/lock/lock0lock.cc'
--- storage/innobase/lock/lock0lock.cc	2014-09-25 14:16:07 +0000
+++ storage/innobase/lock/lock0lock.cc	2014-11-14 09:43:56 +0000
@@ -5959,6 +5959,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) {