bk commit into 5.1 tree (stewart:1.2581) BUG#28253

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-15 12:12:59+10:00, stewart@stripped +1 -0
  [PATCH] BUG#28253 ndb_size.pl: cannot set socket
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@stripped, 2007-08-15 11:49:49+10:00, stewart@stripped
+20 -8
    BUG#28253 ndb_size.pl: cannot set socket

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-merge

--- 1.10/storage/ndb/tools/ndb_size.pl	2007-08-15 11:49:46 +10:00
+++ 1.11/storage/ndb/tools/ndb_size.pl	2007-08-15 11:49:49 +10:00
@@ -403,10 +403,24 @@
 
 package main;
 
-my
($dbh,$database,$hostname,$user,$password,$help,$savequeries,$loadqueries,$debug,$format,$excludetables,$excludedbs);
+my ($dbh,
+    $database,
+    $socket,
+    $hostname,
+    $user,
+    $password);
+
+my ($help,
+    $savequeries,
+    $loadqueries,
+    $debug,
+    $format,
+    $excludetables,
+    $excludedbs);
 
 GetOptions('database|d=s'=>\$database,
 	   'hostname=s'=>\$hostname,
+	   'socket=s'=>\$socket,
 	   'user|u=s'=>\$user,
 	   'password|p=s'=>\$password,
 	   'savequeries|s=s'=>\$savequeries,
@@ -423,7 +437,8 @@
 if($help)
 {
     print STDERR "Usage:\n";
-    print STDERR "\tndb_size.pl --database=<db name>|ALL [--hostname=<host>]"
+    print STDERR "\tndb_size.pl --database=<db name>|ALL [--hostname=<host>]
"
+	."[--socket=<socket>] "
 	."[--user=<user>] [--password=<password>] [--help|-h] [--format=(html|text)]
[--loadqueries=<file>] [--savequeries=<file>]\n\n";
     print STDERR "\t--database=<db name> ALL may be specified to examine all "
 	."databases\n";
@@ -447,6 +462,7 @@
 if(!$loadqueries)
 {
     my $dsn = "DBI:mysql:host=$hostname";
+    $dsn.= ";mysql_socket=$socket" if ($socket);
     $dbh= DBI->connect($dsn, $user, $password) or exit(1);
     $report->dsn($dsn);
 }
@@ -1057,6 +1073,8 @@
     eval 'print STDERR Dumper($report)';
 }
 
+$format= "text" unless $format;
+
 if($format eq 'text')
 {
     my $text_out= new MySQL::NDB::Size::Output::Text($report);
@@ -1066,12 +1084,6 @@
 {
     my $html_out= new MySQL::NDB::Size::Output::HTML($report);
     $html_out->output();
-}
-else
-{
-    # default to text output
-    my $text_out= new MySQL::NDB::Size::Output::Text($report);
-    $text_out->output();
 }
 
 package MySQL::NDB::Size::Output::Text;