bzr push into mysql-trunk branch (andrei.elkin:4330 to 4331)

[Andrei Elkin]

 4331 Andrei Elkin	2012-08-24 [merge]
      merging from 5.6.

    modified:
      sql/rpl_rli_pdb.cc
 4330 Jimmy Yang	2012-08-24 [merge]
      Merge from mysql-5.6 to mysql-trunk

    modified:
      storage/innobase/fts/fts0fts.cc
      storage/innobase/include/ut0vec.ic
=== modified file 'sql/rpl_rli_pdb.cc'
--- a/sql/rpl_rli_pdb.cc	2012-08-24 13:03:14 +0000
+++ b/sql/rpl_rli_pdb.cc	2012-08-24 16:12:06 +0000
@@ -165,7 +165,8 @@ int Slave_worker::init_worker(Relay_log_
   
   wq_overrun_cnt= 0;
   // overrun level is symmetric to underrun (as underrun to the full queue)
-  overrun_level= ((100 - rli->mts_worker_underrun_level) * jobs.size) / 100.0;
+  overrun_level= (ulong) ((100 - rli->mts_worker_underrun_level) * jobs.size)
+    / 100.0;
 
   DBUG_RETURN(0);
 }

No bundle (reason: useless for push emails).