From: Venkatesh Duggirala
Date: September 27 2012 11:10am
Subject: bzr push into mysql-trunk branch (venkatesh.duggirala:4575 to 4576)
 Bug#12776842
List-Archive: http://lists.mysql.com/commits/144898
X-Bug: 12776842
Message-Id: <20120927111019.22277.95044.4576@venkatesh-ThinkPad-T420>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4576 Venkatesh Duggirala	2012-09-27 [merge]
      Null-merge from 5.6 for BUG#12776842

 4575 Harin Vadodaria	2012-09-27 [merge]
      Bug#14658683: INTRODUCE DEPRECATION WARNINGS FOR SYSTEM
                    VARIABLES RELATED TO PROFILING
            
      Description: Merge from mysql-5.6 to mysql-trunk.

    modified:
      mysql-test/r/show_profile.result
      mysql-test/r/wl6443_deprecation.result
      mysql-test/suite/sys_vars/r/have_profiling_basic.result
      mysql-test/suite/sys_vars/r/profiling_basic.result
      mysql-test/suite/sys_vars/r/profiling_h_size_basic.result
      mysql-test/t/profiling.test
      mysql-test/t/wl6443_deprecation.test
      sql/sys_vars.cc
No bundle (reason: useless for push emails).