diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-02-15 01:38:59 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-02-15 01:38:59 +0000 |
| commit | 45f0e2835a1886a7cba7cde0bc7a8d26378524ff (patch) | |
| tree | 336ae201df2a3d904313e297fdd3fbcba89b0d0d /dev-db/mytop | |
| parent | Add patch for a method in Main.java that is needed by testng. (diff) | |
| download | gentoo-2-45f0e2835a1886a7cba7cde0bc7a8d26378524ff.tar.gz gentoo-2-45f0e2835a1886a7cba7cde0bc7a8d26378524ff.tar.bz2 gentoo-2-45f0e2835a1886a7cba7cde0bc7a8d26378524ff.zip | |
Had a bug in the first edition of the patch, roll out a new revision instead.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/mytop')
| -rw-r--r-- | dev-db/mytop/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch | 27 | ||||
| -rw-r--r-- | dev-db/mytop/mytop-1.6-r2.ebuild (renamed from dev-db/mytop/mytop-1.6-r1.ebuild) | 2 |
3 files changed, 29 insertions, 10 deletions
diff --git a/dev-db/mytop/ChangeLog b/dev-db/mytop/ChangeLog index be7eebeef3da..99c18e0bb9f7 100644 --- a/dev-db/mytop/ChangeLog +++ b/dev-db/mytop/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-db/mytop # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.19 2009/02/13 22:09:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.20 2009/02/15 01:38:59 robbat2 Exp $ + +*mytop-1.6-r2 (15 Feb 2009) + + 15 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> + files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch, + -mytop-1.6-r1.ebuild, +mytop-1.6-r2.ebuild: + Had a bug in the first edition of the patch, roll out a new revision + instead. *mytop-1.6-r1 (13 Feb 2009) diff --git a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch b/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch index 85e33fccd952..f1e139fe7471 100644 --- a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch +++ b/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch @@ -10,21 +10,32 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> MySQL-Bug: 41131 MySQL-Bug-URL: http://bugs.mysql.com/?id=41131 +==== +Revision 2: +The first revision missed changing the instances of $OLD_STATUS{Questions}. + diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop ---- mytop-1.6.orig/mytop 2009-02-13 13:59:43.882787823 -0800 -+++ mytop-1.6/mytop 2009-02-13 14:03:54.749418810 -0800 -@@ -800,8 +800,8 @@ +--- mytop-1.6.orig/mytop 2009-02-14 17:28:38.696187159 -0800 ++++ mytop-1.6/mytop 2009-02-14 17:36:31.192890507 -0800 +@@ -800,8 +800,15 @@ ## Queries per second... - my $avg_queries_per_sec = sprintf("%.2f", $STATUS{Questions} / $STATUS{Uptime}); - my $num_queries = $STATUS{Questions}; -+ my $num_queries = defined($STATUS{Queries}) ? $STATUS{Queries} : $STATUS{Questions}; ++ my ($num_queries, $old_num_queries); ++ if(defined($STATUS{Queries})) { ++ $num_queries = $STATUS{Queries}; ++ $old_num_queries = $OLD_STATUS{Queries}; ++ } else { ++ $num_queries = $STATUS{Questions}; ++ $old_num_queries = $OLD_STATUS{Questions}; ++ } + my $avg_queries_per_sec = sprintf("%.2f", $num_queries / $STATUS{Uptime}); my @t = localtime(time); -@@ -820,25 +820,25 @@ +@@ -820,25 +827,25 @@ printf " Queries: %-5s qps: %4.0f Slow: %7s Se/In/Up/De(%%): %02.0f/%02.0f/%02.0f/%02.0f \n", @@ -50,12 +61,12 @@ diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop { - my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} ); -# print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions} / $t_delta = $q_diff\n"); -+ my $q_diff = ( $num_queries - $OLD_STATUS{Questions} ); -+# print("q_diff: $num_queries - $OLD_STATUS{Questions} / $t_delta = $q_diff\n"); ++ my $q_diff = ( $num_queries - $old_num_queries ); ++# print("q_diff: $num_queries - $old_num_queries / $t_delta = $q_diff\n"); printf(" qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n", - ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta, -+ ( $num_queries - $OLD_STATUS{Questions} ) / $t_delta, ++ ( $num_queries - $old_num_queries ) / $t_delta, ( # slow now (qps) ($STATUS{Slow_queries} ) ? ( $STATUS{Slow_queries} - $OLD_STATUS{Slow_queries} ) / $t_delta : diff --git a/dev-db/mytop/mytop-1.6-r1.ebuild b/dev-db/mytop/mytop-1.6-r2.ebuild index 8ccb7f4a695b..98137f61d663 100644 --- a/dev-db/mytop/mytop-1.6-r1.ebuild +++ b/dev-db/mytop/mytop-1.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6-r1.ebuild,v 1.1 2009/02/13 22:09:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6-r2.ebuild,v 1.1 2009/02/15 01:38:59 robbat2 Exp $ inherit perl-app |