aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Seaman <matthew@FreeBSD.org>2012-06-01 05:08:39 +0000
committerMatthew Seaman <matthew@FreeBSD.org>2012-06-01 05:08:39 +0000
commit24315159daa0089f08acea4ba1b130fb6721ad5c (patch)
treeb30df872e46e88c98d10a47dd1aa7aaf6a906078
parent249914eb08ab68fb1bb2bbffed49901ea5f18b5d (diff)
downloadports-24315159daa0089f08acea4ba1b130fb6721ad5c.tar.gz
ports-24315159daa0089f08acea4ba1b130fb6721ad5c.zip
Notes
-rw-r--r--databases/mytop/Makefile2
-rw-r--r--databases/mytop/files/patch-mytop43
2 files changed, 40 insertions, 5 deletions
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index 4908796e8b77..f6c144cb66d7 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mytop
PORTVERSION= 1.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= databases
MASTER_SITES= http://jeremy.zawodny.com/mysql/mytop/
diff --git a/databases/mytop/files/patch-mytop b/databases/mytop/files/patch-mytop
index d874a73b7a1b..efe59ccbc660 100644
--- a/databases/mytop/files/patch-mytop
+++ b/databases/mytop/files/patch-mytop
@@ -1,5 +1,8 @@
---- mytop.orig 2007-02-17 12:57:46.000000000 +0800
-+++ mytop 2012-05-18 13:58:30.000000000 +0800
+
+$FreeBSD$
+
+--- mytop.orig
++++ mytop
@@ -153,7 +153,7 @@
"idle|i" => \$config{idle},
"resolve|r" => \$config{resolve},
@@ -127,7 +130,7 @@
+ $lines_left--;
+ }
+ }
-+
+
+ my @slave_status = Hashes("show slave status");
+ if (@slave_status)
+ {
@@ -148,11 +151,34 @@
+ $lines_left--;
+ }
+ }
-
++
+ print "\n";
$lines_left--;
}
+@@ -905,19 +952,19 @@
+ ##
+
+ #my $sz = $width - 52;
+- my @sz = (8, 9, 15, 10, 9, 6);
++ my @sz = (9, 9, 15, 10, 9, 6);
+ my $used = scalar(@sz) + Sum(@sz);
+ my $free = $width - $used;
+
+ print BOLD();
+
+- printf "%8s %9s %15s %10s %9s %6s %-${free}s\n",
++ printf "%9s %9s %15s %10s %9s %6s %-${free}s\n",
+ 'Id','User','Host/IP','DB','Time', 'Cmd', 'Query or State';
+
+ print RESET();
+
+ ## Id User Host DB
+- printf "%8s %9s %15s %10s %9s %6s %-${free}s\n",
++ printf "%9s %9s %15s %10s %9s %6s %-${free}s\n",
+ '--','----','-------','--','----', '---', '----------';
+
+ $lines_left -= 2;
@@ -952,8 +999,11 @@
{
$thread->{Host} =~ s/:\d+$//;
@@ -167,6 +193,15 @@
}
## Fix possible undefs
+@@ -1044,7 +1094,7 @@
+ print GREEN() if $thread->{Command} eq 'Connect';
+ }
+
+- printf "%8d %9.9s %15.15s %10.10s %9d %6.6s %-${free}.${free}s\n",
++ printf "%9d %9.9s %15.15s %10.10s %9d %6.6s %-${free}.${free}s\n",
+ $thread->{Id}, $thread->{User}, $thread->{Host}, $thread->{db},
+ $thread->{Time}, $thread->{Command}, $smInfo;
+
@@ -1099,8 +1149,8 @@
my @data = Hashes("SHOW INNODB STATUS");