bzr push into mysql-trunk branch (vasil.dimov:4085 to 4086)

[vasil.dimov]

 4086 Vasil Dimov	2012-07-19 [merge]
      Merge mysql-5.6 -> mysql-trunk

    modified:
      storage/innobase/buf/buf0lru.cc
 4085 Venkata Sidagam	2012-07-19 [merge]
      Null merge

=== modified file 'storage/innobase/buf/buf0lru.cc'
--- a/storage/innobase/buf/buf0lru.cc	revid:venkata.sidagam@stripped
+++ b/storage/innobase/buf/buf0lru.cc	revid:vasil.dimov@stripped
@@ -391,7 +391,7 @@ If we have hogged the resources for too 
 pool and flush list mutex and do a thread yield. Set the current page
 to "sticky" so that it is not relocated during the yield.
 @return true if yielded */
-static	__attribute__((nonnull, warn_unused_result))
+static	__attribute__((nonnull(1), warn_unused_result))
 bool
 buf_flush_try_yield(
 /*================*/

No bundle (reason: useless for push emails).