bzr push into mysql-trunk branch (jon.hauglid:4280 to 4281)

[Jon Olav Hauglid]

 4281 Jon Olav Hauglid	2012-08-23 [merge]
      Merge from mysql-5.6 to mysql-trunk
      No conflicts

    modified:
      sql/item_subselect.cc
      sql/log_event.cc
      storage/innobase/trx/trx0trx.cc
 4280 Marko Mäkelä	2012-08-23 [merge]
      Merge mysql-5.6 to mysql-trunk.

    modified:
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/t/innodb_bug13867871.test
=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2012-08-21 07:45:27 +0000
+++ b/sql/item_subselect.cc	2012-08-23 08:39:46 +0000
@@ -1131,7 +1131,6 @@ Item_exists_subselect::Item_exists_subse
      sj_convert_priority(0), embedding_join_nest(NULL)
 {
   DBUG_ENTER("Item_exists_subselect::Item_exists_subselect");
-  bool val_bool();
   init(select_lex, new select_exists_subselect(this));
   max_columns= UINT_MAX;
   null_value= FALSE; //can't be NULL

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2012-08-22 08:31:12 +0000
+++ b/sql/log_event.cc	2012-08-23 08:39:46 +0000
@@ -1318,7 +1318,7 @@ Log_event* Log_event::read_log_event(IO_
   Log_event *res=  0;
 #ifndef max_allowed_packet
   THD *thd=current_thd;
-  uint max_allowed_packet= thd ? slave_max_allowed_packet:~(ulong)0;
+  uint max_allowed_packet= thd ? slave_max_allowed_packet : ~0U;
 #endif
 
   ulong const max_size=

=== modified file 'storage/innobase/trx/trx0trx.cc'
--- a/storage/innobase/trx/trx0trx.cc	2012-07-11 03:54:20 +0000
+++ b/storage/innobase/trx/trx0trx.cc	2012-08-23 08:21:03 +0000
@@ -992,7 +992,7 @@ trx_finalize_for_fts(
 /**********************************************************************//**
 If required, flushes the log to disk based on the value of
 innodb_flush_log_at_trx_commit. */
-static __attribute__((nonnull))
+static
 void
 trx_flush_log_if_needed_low(
 /*========================*/

No bundle (reason: useless for push emails).