Update to 2.1.1
This commit is contained in:
giovanni
parent
29b65f69b2
commit
b049095bc8
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2012/03/08 14:27:17 giovanni Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2012/04/18 13:24:21 giovanni Exp $
|
||||
|
||||
COMMENT = MySQL Percona tools
|
||||
|
||||
V = 2.0.4
|
||||
V = 2.1.1
|
||||
DISTNAME = percona-toolkit-${V}
|
||||
EPOCH = 0
|
||||
CATEGORIES = databases perl5
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (percona-toolkit-2.0.4.tar.gz) = 333/zMtI1Q8UOElikijUtA==
|
||||
RMD160 (percona-toolkit-2.0.4.tar.gz) = rHLsWs51ALLysoQolRx8/54Y6ZY=
|
||||
SHA1 (percona-toolkit-2.0.4.tar.gz) = ERfbRpIPCH4ZIgTcG9NPk9FAWAQ=
|
||||
SHA256 (percona-toolkit-2.0.4.tar.gz) = C3PZxm4m1MRxKhLsq3Oebn11jiGFB0UnbpUrHF2Sxo8=
|
||||
SIZE (percona-toolkit-2.0.4.tar.gz) = 1074798
|
||||
MD5 (percona-toolkit-2.1.1.tar.gz) = FL5qPjHHsgrsp44+Cu1u3A==
|
||||
RMD160 (percona-toolkit-2.1.1.tar.gz) = QXL4RDX8QDgkQpdO4nQGIZRdcN8=
|
||||
SHA1 (percona-toolkit-2.1.1.tar.gz) = u68kQMVbtitemNCL0yRugshPbyo=
|
||||
SHA256 (percona-toolkit-2.1.1.tar.gz) = ro/AR57kih7xiCAG7s+83Tuhq1yuGYJQh/sC2W2OSjk=
|
||||
SIZE (percona-toolkit-2.1.1.tar.gz) = 1182760
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-bin_pt-mysql-summary,v 1.1.1.1 2012/02/27 10:18:12 giovanni Exp $
|
||||
--- bin/pt-mysql-summary.orig Mon Feb 6 21:52:31 2012
|
||||
+++ bin/pt-mysql-summary Thu Feb 9 16:49:50 2012
|
||||
@@ -155,7 +155,7 @@ shorten() {
|
||||
# docs and tests.
|
||||
# ##############################################################################
|
||||
group_concat () {
|
||||
- sed -e '{H; $!d}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' ${1}
|
||||
+ sed -e 'H; $!d' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' ${1}
|
||||
$OpenBSD: patch-bin_pt-mysql-summary,v 1.2 2012/04/18 13:24:21 giovanni Exp $
|
||||
--- bin/pt-mysql-summary.orig Tue Apr 3 21:51:38 2012
|
||||
+++ bin/pt-mysql-summary Wed Apr 18 15:12:57 2012
|
||||
@@ -596,7 +596,7 @@ shorten() {
|
||||
}
|
||||
|
||||
# Accepts a number of seconds, and outputs a d+h:m:s formatted string
|
||||
group_concat () {
|
||||
- sed -e '{H; $!d;}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
|
||||
+ sed -e 'H; $!d;' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
|
||||
}
|
||||
|
||||
# ###########################################################################
|
||||
|
||||
@ -1,64 +1,9 @@
|
||||
$OpenBSD: patch-bin_pt-summary,v 1.1.1.1 2012/02/27 10:18:12 giovanni Exp $
|
||||
--- bin/pt-summary.orig Mon Feb 6 21:52:31 2012
|
||||
+++ bin/pt-summary Fri Feb 24 09:22:49 2012
|
||||
$OpenBSD: patch-bin_pt-summary,v 1.2 2012/04/18 13:24:21 giovanni Exp $
|
||||
--- bin/pt-summary.orig Tue Apr 3 21:51:38 2012
|
||||
+++ bin/pt-summary Wed Apr 18 15:08:55 2012
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!${LOCALBASE}/bin/bash
|
||||
|
||||
# This program is part of Percona Toolkit: http://www.percona.com/software/
|
||||
# See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
|
||||
@@ -219,6 +219,15 @@ parse_sysctl_cpu_freebsd() {
|
||||
}
|
||||
|
||||
# ##############################################################################
|
||||
+# Detect cpu info on OpenBSD, and format it as CPU info
|
||||
+# ##############################################################################
|
||||
+parse_sysctl_cpu_openbsd() {
|
||||
+ name_val "Processors" "$(sysctl -n hw.ncpu)"
|
||||
+ name_val "Speeds" "$(sysctl -n hw.cpuspeed)"
|
||||
+ name_val "Models" "$(sysctl -n hw.model)"
|
||||
+}
|
||||
+
|
||||
+# ##############################################################################
|
||||
# Parse CPU info from psrinfo -v
|
||||
# ##############################################################################
|
||||
parse_psrinfo_cpus() {
|
||||
@@ -274,6 +283,17 @@ parse_memory_sysctl_freebsd() {
|
||||
}
|
||||
|
||||
# ##############################################################################
|
||||
+# Parse OpenBSD memory info from sysctl output.
|
||||
+# ##############################################################################
|
||||
+parse_memory_sysctl_openbsd() {
|
||||
+ swap_mem=$(swapctl -s | awk '{print $2;}')
|
||||
+ swap_mem=$(bc -e $swap_mem*512 -e quit)
|
||||
+ name_val Total $(shorten $(sysctl -n hw.physmem) 1)
|
||||
+ name_val User $(shorten $(sysctl -n hw.usermem) 1)
|
||||
+ name_val Swap $(shorten ${swap_mem} 1)
|
||||
+}
|
||||
+
|
||||
+# ##############################################################################
|
||||
# Parse memory devices from the output of 'dmidecode'.
|
||||
# ##############################################################################
|
||||
parse_dmidecode_mem_devices () {
|
||||
@@ -929,6 +949,9 @@ main () {
|
||||
elif [ "${platform}" = "FreeBSD" ]; then
|
||||
release="$(uname -r)"
|
||||
kernel="$(sysctl -n kern.osrevision)"
|
||||
+ elif [ "${platform}" = "OpenBSD" ]; then
|
||||
+ release="$(uname -r)"
|
||||
+ kernel="$(sysctl -n kern.version | awk '{print $2;}')"
|
||||
elif [ "${platform}" = "SunOS" ]; then
|
||||
release="$(head -n1 /etc/release)"
|
||||
if [ -z "${release}" ]; then
|
||||
@@ -947,6 +970,10 @@ main () {
|
||||
fi
|
||||
elif [ "${platform}" = "FreeBSD" ]; then
|
||||
if sysctl hw.machine_arch | grep -v 'i[36]86' >/dev/null; then
|
||||
+ CPU_ARCH='64-bit'
|
||||
+ fi
|
||||
+ elif [ "${platform}" = "OpenBSD" ]; then
|
||||
+ if arch -s | grep '64' >/dev/null; then
|
||||
CPU_ARCH='64-bit'
|
||||
fi
|
||||
elif [ "${platform}" = "SunOS" ]; then
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/02/27 10:18:12 giovanni Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2012/04/18 13:24:21 giovanni Exp $
|
||||
@pkgpath databases/maatkit
|
||||
bin/pt-align
|
||||
bin/pt-archiver
|
||||
@ -9,6 +9,7 @@ bin/pt-deadlock-logger
|
||||
bin/pt-duplicate-key-checker
|
||||
bin/pt-fifo-split
|
||||
bin/pt-find
|
||||
bin/pt-fingerprint
|
||||
bin/pt-fk-error-logger
|
||||
bin/pt-heartbeat
|
||||
bin/pt-index-usage
|
||||
@ -30,6 +31,7 @@ bin/pt-slave-restart
|
||||
bin/pt-summary
|
||||
bin/pt-table-checksum
|
||||
bin/pt-table-sync
|
||||
bin/pt-table-usage
|
||||
bin/pt-tcp-model
|
||||
bin/pt-trend
|
||||
bin/pt-upgrade
|
||||
@ -45,6 +47,7 @@ bin/pt-visual-explain
|
||||
@man man/man1/pt-duplicate-key-checker.1
|
||||
@man man/man1/pt-fifo-split.1
|
||||
@man man/man1/pt-find.1
|
||||
@man man/man1/pt-fingerprint.1
|
||||
@man man/man1/pt-fk-error-logger.1
|
||||
@man man/man1/pt-heartbeat.1
|
||||
@man man/man1/pt-index-usage.1
|
||||
@ -66,6 +69,7 @@ bin/pt-visual-explain
|
||||
@man man/man1/pt-summary.1
|
||||
@man man/man1/pt-table-checksum.1
|
||||
@man man/man1/pt-table-sync.1
|
||||
@man man/man1/pt-table-usage.1
|
||||
@man man/man1/pt-tcp-model.1
|
||||
@man man/man1/pt-trend.1
|
||||
@man man/man1/pt-upgrade.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user