bzr push into mysql-trunk branch (alexander.barkov:3993 to 3994)

[Alexander Barkov]

 3994 Alexander Barkov	2012-07-06 [merge]
      Merging from mysql-5.6

    modified:
      sql/gcalc_tools.cc
 3993 Jimmy Yang	2012-07-06 [merge]
      Merge from mysql-5.6 to mysql-trunk

    removed:
      mysql-test/suite/innodb/r/innodb-bug14219515.result
      mysql-test/suite/innodb/t/innodb-bug14219515.test
    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'sql/gcalc_tools.cc'
--- a/sql/gcalc_tools.cc	2012-07-05 08:42:00 +0000
+++ b/sql/gcalc_tools.cc	2012-07-06 06:40:40 +0000
@@ -1297,7 +1297,7 @@ int Gcalc_result_receiver::reorder_chunk
     sorted+= chunk->length;
   }
   // Make sure all chunks were put
-  DBUG_ASSERT(sorted - tmp.ptr() == buffer.length());
+  DBUG_ASSERT(sorted - tmp.ptr() == (size_t) buffer.length());
   // Get all data from tmp and unlink tmp from its buffer.
   buffer.takeover(tmp);
   DBUG_RETURN(0);

No bundle (reason: useless for push emails).