From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- dev-db/mytop/Manifest | 3 - .../files/mytop-1.6-getopt-long-2.38-fixup.patch | 14 --- dev-db/mytop/files/mytop-1.6-global-status.patch | 103 --------------------- ...top-1.6-queries-vs-questions-mysql-5.0.76.patch | 72 -------------- 4 files changed, 192 deletions(-) delete mode 100644 dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch delete mode 100644 dev-db/mytop/files/mytop-1.6-global-status.patch delete mode 100644 dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch (limited to 'dev-db/mytop') diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest index 05bc1d9eb48c..f893272aed14 100644 --- a/dev-db/mytop/Manifest +++ b/dev-db/mytop/Manifest @@ -1,6 +1,3 @@ -AUX mytop-1.6-getopt-long-2.38-fixup.patch 578 BLAKE2B fc50dbdf44099cb812dc5610f22cada2010d684fd0914b544beaacf62478b3c3f1f179ebdc9ff9f7da07fe2764a2fdf32e43827e17b7bab1e8809a614e4cfb09 SHA512 a6f6bc9757112acc8cdeeb19e89487ad2ca79524c8d7a577b84c288addc283547837f390a7d7f43317d878e5be796be9d875fd57f548637a3d52aa1cabc5f3a8 -AUX mytop-1.6-global-status.patch 3694 BLAKE2B 68b2f93f74d4038d5e0527df65061a5b8b37efbfaffcbb31ead0e2cb0d36f939da3449e90c39d942d09316afea803a98ddb59bdb5e47450a71000737a4e33ce7 SHA512 bf33682ed457acac751390f757b4b284cf68cae1facdc5d9f3980abae3a3a6580b0558cd114569e79cab2b4ede430fba1c8b426d8b6d500fe0edf833b74d17ab -AUX mytop-1.6-queries-vs-questions-mysql-5.0.76.patch 3365 BLAKE2B b28c2855e90201e1c7e5c94a76036b751f7428b3726fcc9d69b5848eb4fd8fe6c0cd538b80f901eef95586aa965485c64571439884f3fdda41a66f230355aba7 SHA512 a2735b157b81f702af09d6ee38003e4d15b6f901bc8f5e7013e8c73a1bd9ee798d0ed00ac0578b7e8ef36e5d4ddcc65489325937e9c2074004d2f69fb81fdcfb AUX mytop-1.9.1-global-status.patch 3459 BLAKE2B 338dffab012e3026d1c4e5edf241cf15a4bc2d67b1a29f4770aeb20b952d5d171e9fd805e21a963652eb601a4ed3bb5ddf3dd35fd310f66ce4fb89eee7257f9c SHA512 68052535131147a446133fbc155e04e13c5f0195c8fd111059b2bc266aa7a79f72cb25ec1f453e051651783760e212349dc7c50e1de2768d45281d25582a0cc9 AUX mytop-1.9.1-queries-vs-questions-mysql-5.0.76.patch 3431 BLAKE2B 4d1d18cd3c9f9f74df49ab1958e68b50e286700619e28c8fc3e701a51eb4e95b5a1a8da2bae0e671f458f163d17ee163a30b697cc02219d118f0a05ecc00498f SHA512 50f5373dda953ea7ac18aff65b1319999fe0c53471ebef548309e49e2c6f762d5d98f105280a2c58a324731ff3c1c1af123114acf09f6bb3c99e4580e6041473 DIST mytop-1.9.1.tar.gz 22095 BLAKE2B d0281fce93d9165593d5a94229a5de0d2b18d38b02e69329322e62611b5d9546d08626ea60ea7ede4d6ee88fc7df08c733cb5437fb47c468e0d591d7dde00595 SHA512 e6d38812dd69f5e330e5fe9206abe7e00c9e08dd61ba52a9dbd18a823bb09715832d27fb8db6fe1146d78eb56845cc0a7e2a72989ee56267d6482238fee84bc5 diff --git a/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch b/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch deleted file mode 100644 index b911f9067baa..000000000000 --- a/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch +++ /dev/null @@ -1,14 +0,0 @@ -Getopt-Long-2.38 is stricter about what it allows. - -diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop ---- mytop-1.6.orig/mytop 2009-04-10 00:47:31.007111359 -0700 -+++ mytop-1.6/mytop 2009-04-10 00:50:39.875391905 -0700 -@@ -153,7 +153,7 @@ - "idle|i" => \$config{idle}, - "resolve|r" => \$config{resolve}, - "prompt!" => \$config{prompt}, -- "long|!" => \$config{long_nums}, -+ "long!" => \$config{long_nums}, - "mode|m=s" => \$config{mode}, - "sort=s" => \$config{sort}, - ); diff --git a/dev-db/mytop/files/mytop-1.6-global-status.patch b/dev-db/mytop/files/mytop-1.6-global-status.patch deleted file mode 100644 index ae75ac7867af..000000000000 --- a/dev-db/mytop/files/mytop-1.6-global-status.patch +++ /dev/null @@ -1,103 +0,0 @@ -Use GLOBAL STATUS instead of implicit session status. - -As of MySQL-5.0.72, many of the status variables split for session and global -variants. Importantly, the Com_* and Questions ones did, and this broke the -statistics at the top of mytop. - -Signed-off-by: Robin H. Johnson -MySQL-Bug: 41131 -MySQL-Bug-URL: http://bugs.mysql.com/bug.php?id=41131 - -diff -Nuar --exclude '*~' mytop-1.6.orig/mytop mytop-1.6/mytop ---- mytop-1.6.orig/mytop 2007-02-16 20:57:46.000000000 -0800 -+++ mytop-1.6/mytop 2008-11-30 15:18:05.818845253 -0800 -@@ -98,7 +98,7 @@ - my %qcache = (); ## The query cache--used for full query info support. - my %ucache = (); ## The user cache--used for full killing by user - my %dbcache = (); ## The db cache. This should be merged at some point. --my %statcache = (); ## The show status cache for GetShowStatus() -+my %statcache = (); ## The show global status cache for GetShowStatus() - - my (%STATUS, %OLD_STATUS); # header stuff. - -@@ -710,7 +710,7 @@ - ## - if ($config{header}) - { -- my @recs = Hashes("show status"); -+ my @recs = Hashes("show global status"); - - ## if the server died or we lost connectivity - if (not @recs) -@@ -755,7 +755,7 @@ - - ## Query Cache info - ## -- ## mysql> show status like 'qcache%'; -+ ## mysql> show global status like 'qcache%'; - ## +-------------------------+----------+ - ## | Variable_name | Value | - ## +-------------------------+----------+ -@@ -1064,7 +1064,7 @@ - - sub GetQPS() - { -- my($data) = Hashes('SHOW STATUS LIKE "Questions"'); -+ my($data) = Hashes('SHOW GLOBAL STATUS LIKE "Questions"'); - my $num = $data->{Value}; - - if (not defined $questions) ## first time? -@@ -1126,7 +1126,7 @@ - } - - # Variable_name and Value pairs come back... -- my @data = Hashes("SHOW STATUS LIKE 'Com_%'"); -+ my @data = Hashes("SHOW GLOBAL STATUS LIKE 'Com_%'"); - my %cmd_data; - my %cmd_delta; - my %cmd_pct; -@@ -1216,7 +1216,7 @@ - sub GetShowStatus() - { - Clear() unless $config{batchmode}; -- my @rows = Hashes("SHOW STATUS"); -+ my @rows = Hashes("SHOW GLOBAL STATUS"); - - printf "%32s %10s %10s\n", 'Counter', 'Total', 'Change'; - printf "%32s %10s %10s\n", '-------', '-----', '------'; -@@ -1543,7 +1543,7 @@ - - And you obviously need access to a MySQL server (version 3.22.x or - 3.23.x) with the necessary security to run the I and --I commands. -+I commands. - - If you are a Windows user, using ActiveState's Perl, you can use PPM - (the Perl Package Manager) to install the MySQL and Term::ReadKey -@@ -1599,7 +1599,7 @@ - notice features from each of them here. - - B will connect to a MySQL server and periodically run the --I and I commands and attempt to -+I and I commands and attempt to - summarize the information from them in a useful format. - - =head2 The Display -@@ -1817,7 +1817,7 @@ - - =item B - --Show "command counters" based on the Com_* values in SHOW STATUS. -+Show "command counters" based on the Com_* values in SHOW GLOBAL STATUS. - This is a new feature. Feedback welcome. - - =item B -@@ -1904,7 +1904,7 @@ - - Some performance information is not available when talking to a - version 3.22.x MySQL server. Additional information (about threads --mostly) was added to the output of I in MySQL 3.23.x and -+mostly) was added to the output of I in MySQL 3.23.x and - B makes use of it. If the information is not available, you - will simply see zeros where the real numbers should be. - 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 deleted file mode 100644 index f1e139fe7471..000000000000 --- a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch +++ /dev/null @@ -1,72 +0,0 @@ -In MySQL 5.0.72 the Questions variable was changed to only contain the number -of client-initiated queries, NOT the number of overall queries. This caused -problems with the select/insert/update/delete percentages because Com_* was -still based on the overall queries. - -MySQL 5.0.76 introduced a new variable 'Queries' with the behavior of the old -Questions variable. - -Signed-off-by: Robin H. Johnson -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-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, $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 +827,25 @@ - - - printf " Queries: %-5s qps: %4.0f Slow: %7s Se/In/Up/De(%%): %02.0f/%02.0f/%02.0f/%02.0f \n", -- make_short( $STATUS{Questions} ), # q total -- $STATUS{Questions} / $STATUS{Uptime}, # qps, average -+ make_short( $num_queries ), # q total -+ $num_queries / $STATUS{Uptime}, # qps, average - make_short( $STATUS{Slow_queries} ), # slow - - # hmm. a Qcache hit is really a select and should be counted. -- 100 * ($STATUS{Com_select} + ($STATUS{Qcache_hits}||0) ) / $STATUS{Questions}, -- 100 * ($STATUS{Com_insert} + $STATUS{Com_replace} ) / $STATUS{Questions}, -- 100 * ($STATUS{Com_update} ) / $STATUS{Questions}, -- 100 * $STATUS{Com_delete} / $STATUS{Questions}; -+ 100 * ($STATUS{Com_select} + ($STATUS{Qcache_hits}||0) ) / $num_queries, -+ 100 * ($STATUS{Com_insert} + $STATUS{Com_replace} ) / $num_queries, -+ 100 * ($STATUS{Com_update} ) / $num_queries, -+ 100 * $STATUS{Com_delete} / $num_queries; - - $lines_left--; - - if ($t_delta) - { -- 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_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_num_queries ) / $t_delta, - ( # slow now (qps) - ($STATUS{Slow_queries} ) ? - ( $STATUS{Slow_queries} - $OLD_STATUS{Slow_queries} ) / $t_delta : -- cgit v1.2.3