bzr push into mysql-5.1-telco-7.1 branch (frazer.clement:4496 to 4497)

[Frazer Clement]

 4497 Frazer Clement	2012-03-23 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/tools/ndb_size.pl
 4496 Craig L Russell	2012-03-22
      Update clusterj pom.xml to 7.1.21

    modified:
      storage/ndb/clusterj/clusterj-api/pom.xml
      storage/ndb/clusterj/clusterj-bindings/pom.xml
      storage/ndb/clusterj/clusterj-core/pom.xml
      storage/ndb/clusterj/clusterj-jdbc/pom.xml
      storage/ndb/clusterj/clusterj-jpatest/pom.xml
      storage/ndb/clusterj/clusterj-openjpa/pom.xml
      storage/ndb/clusterj/clusterj-test/pom.xml
      storage/ndb/clusterj/clusterj-tie/pom.xml
      storage/ndb/clusterj/pom.xml
=== modified file 'storage/ndb/tools/ndb_size.pl'
--- a/storage/ndb/tools/ndb_size.pl	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/tools/ndb_size.pl	2012-03-23 12:43:28 +0000
@@ -462,7 +462,9 @@ my %queries; # used for loadqueries/save
 
 if(!$loadqueries)
 {
-    my $dsn = "DBI:mysql:host=$hostname";
+    my ($host,$port) = split(/:/, $hostname);
+    my $dsn = "DBI:mysql:host=$host";
+    $dsn.= ";port=$port" if ($port);
     $dsn.= ";mysql_socket=$socket" if ($socket);
     $dbh= DBI->connect($dsn, $user, $password) or exit(1);
     $report->dsn($dsn);

No bundle (reason: useless for push emails).