From: Andrei Elkin
Date: August 24 2012 4:12pm
Subject: bzr push into mysql-5.6 branch (andrei.elkin:4176 to 4177) Bug#13897025
List-Archive: http://lists.mysql.com/commits/144617
X-Bug: 13897025
Message-Id: <201208241612.q7OGCgdO001460@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4177 Andrei Elkin	2012-08-24
      Bug#13897025: post-pushes fixes to satisfy gcov build.

    modified:
      sql/rpl_rli_pdb.cc
 4176 Jimmy Yang	2012-08-24
      Fix Bug #14527245 - ASSERT MUTEX_OWN(&DICT_SYS->MUTEX) 
      DICT_TABLE_MOVE_FROM_LRU_TO_NON_LRU FTS
      
      rb://1243 approved by Sunny Bains

    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:00:09 +0000
+++ b/sql/rpl_rli_pdb.cc	2012-08-24 16:11: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).