From: Akhil Mohan
Date: September 7 2012 2:00pm
Subject: bzr push into mysql-5.6 branch (akhil.mohan:4249 to 4250)
List-Archive: http://lists.mysql.com/commits/144732
Message-Id: <20120907140000.25243.529.4250@helheim.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4250 Akhil Mohan	2012-09-07 [merge]
      Empty version change upmerge

 4249 Jimmy Yang	2012-09-07
      Fix Bug 14594526 - FK: ASSERTION IN DICT_TABLE_CHECK_FOR_DUP_INDEXES
      
      rb://1275 approved by Marko

    modified:
      mysql-test/suite/innodb/r/innodb-index-online-fk.result
      mysql-test/suite/innodb/t/innodb-index-online-fk.test
      storage/innobase/handler/handler0alter.cc
No bundle (reason: useless for push emails).