From: magnus.blaudd Date: November 12 2012 2:56pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4084 to 4086) List-Archive: http://lists.mysql.com/commits/145271 Message-Id: <20121112145650.13673.16031.4086@wholphin> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4086 magnus.blaudd@stripped 2012-11-12 [merge] Merge 7.1 -> 7.2 4085 magnus.blaudd@stripped 2012-11-12 compile-cluster - move misplaced "use" directive modified: storage/ndb/compile-cluster 4084 magnus.blaudd@stripped 2012-11-12 [merge] Merge 7.1 -> 7.2 modified: storage/ndb/compile-cluster storage/ndb/src/mgmsrv/testConfig.cpp === modified file 'storage/ndb/compile-cluster' --- a/storage/ndb/compile-cluster 2012-11-12 14:36:27 +0000 +++ b/storage/ndb/compile-cluster 2012-11-12 14:53:39 +0000 @@ -426,7 +426,6 @@ sub build_cmd { # package WarningParser::Warning; use strict; -use Cwd 'abs_path'; sub new { my ($class, $file, $line, $text)= @_; @@ -503,6 +502,7 @@ sub is_cluster_warning { package WarningParser; use strict; +use Cwd 'abs_path'; sub new { my $class= shift; No bundle (reason: useless for push emails).