From: Joerg Bruehe
Date: August 6 2012 8:33am
Subject: bzr push into mysql-5.6 branch (joerg.bruehe:4116 to 4117)
List-Archive: http://lists.mysql.com/commits/144524
Message-Id: <20120806083307.4381.89418.4117@trift-6core.fambruehe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4117 Joerg Bruehe	2012-08-06 [merge]
      Empty upmerge (of the 5.5.27 merge-back)

 4116 Sunny Bains	2012-08-06
      Bug#14158025 - ASSERT ON LOCK_TABLE_LOCKS_LOOKUP, TABLE CACHE EVICTION
      
      The debug (exhaustive) check over all the active transactions to check
      for any locks over a table should be done only if the the check on
      the table instance claims that there are no locks against it.
      
      Approved by Jimmy Yang over IM

    modified:
      storage/innobase/lock/lock0lock.cc
No bundle (reason: useless for push emails).