From: Mayank Prasad Date: May 20 2011 8:42am Subject: bzr commit into mysql-trunk branch (mayank.prasad:3102) Bug#11764633 List-Archive: http://lists.mysql.com/commits/137766 X-Bug: 11764633 Message-Id: <201105200842.p4K8gg6m001784@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/mayank/mysql-tree/mydefects/trunk_11764633/ based on revid:mayank.prasad@stripped 3102 Mayank Prasad 2011-05-20 [merge] BUG#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED Merging pending revision from 5.5 after resolveing conflicts. No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).