From: Marc Alff
Date: January 26 2011 3:50pm
Subject: bzr push into mysql-trunk branch (marc.alff:3554 to 3555)
List-Archive: http://lists.mysql.com/commits/129680
Message-Id: <201101261550.p0QFosgs017346@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3555 Marc Alff	2011-01-26
      Used the correct test name in default.experimental for debug_env

    modified:
      mysql-test/collections/default.experimental
 3554 Marc Alff	2011-01-26 [merge]
      Local merge

    modified:
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/t/innodb_mysql_sync.test
      sql/ha_partition.cc
      sql/handler.h
      sql/sql_table.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-01-26 14:41:43 +0000
+++ b/mysql-test/collections/default.experimental	2011-01-26 15:50:00 +0000
@@ -43,5 +43,5 @@ main.type_newdecimal                    
 
 # Not a test, utility to troubleshoot test failures
 # Flagged as experimental since output will vary
-performance_schema.debug_env             # Bug#59740 2011-02-26 Marc Alff, script needed to investigate the failure
+perfschema.debug_env                     # Bug#59740 2011-02-26 Marc Alff, script needed to investigate the failure
 

No bundle (reason: useless for push emails).