bzr push into mysql-trunk-innodb branch (marko.makela:3267 to 3268)

[marko.makela]

 3268 Marko Mäkelä	2010-10-21 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb

    modified:
      storage/innobase/lock/lock0lock.c
 3267 Sunny Bains	2010-10-21
      Change ++ to -- when we discard a record lock. This crept in at the last
      minute when updating code after last review.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:sunny.bains@strippedy403de
+++ b/storage/innobase/lock/lock0lock.c	revid:marko.makela@stripped
@@ -4890,11 +4890,11 @@ loop:
 			ut_a(rec);
 			offsets = rec_get_offsets(rec, index, offsets,
 						  ULINT_UNDEFINED, &heap);
-
+#if 0
 			fprintf(stderr,
 				"Validating %lu %lu\n",
 				(ulong) space, (ulong) page_no);
-
+#endif
 			lock_mutex_exit_kernel();
 
 			/* If this thread is holding the file space

Attachment: [text/bzr-bundle] bzr/[e-mail]