From: Nisha Gopalakrishnan
Date: July 26 2012 11:04am
Subject: bzr push into mysql-trunk branch (nisha.gopalakrishnan:4125 to 4126)
 Bug#11748842
List-Archive: http://lists.mysql.com/commits/144495
X-Bug: 11748842
Message-Id: <201207261104.q6QB4bNO000570@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4126 Nisha Gopalakrishnan	2012-07-26 [merge]
      BUG#11748842:CREATE TABLE: NO WARNING IF REQUESTED DUPLICATE INDEX FOR
                         THE SAME COLUMN.
      
      Null merge from 5.6 to trunk.

 4125 Mats Kindahl	2012-07-26 [merge]
      Merging to mysql-trunk.

    modified:
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      mysql-test/suite/perfschema/r/relaylog.result
      sql/mysqld.cc
No bundle (reason: useless for push emails).