From: magnus.blaudd
Date: December 12 2012 3:02pm
Subject: bzr push into mysql-trunk branch (magnus.blaudd:5226 to 5227)
List-Archive: http://lists.mysql.com/commits/145503
Message-Id: <20121212150204.20717.93220.5227@wholphin>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5227 magnus.blaudd@stripped	2012-12-12 [merge]
      Merge 5.6 -> trunk

 5226 Mayank Prasad	2012-12-12 [merge]
      Bug#14494893 : INNODB_FILE_PER_TABLE DOES NOT PERMIT ON/OFF AT STARTUP
      
      Details :
        Merge : 5.6->trunk

    added:
      mysql-test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt
    modified:
      mysys_ssl/my_getopt.cc
No bundle (reason: useless for push emails).