percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add back blank lines around Schema section contents. Use default vals for OPT_DATABASE, OPT_ALL_DATABASES, and OPT_READ_SAMPLE in report_mysql_info.sh to avoid errors in unit tests.

Browse Source
This commit is contained in:
Daniel Nichter
2013-12-12 05:02:34 +00:00
parent 826685e636
commit 591e5e00f3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/pt-mysql-summary
View File

@@ -1568,6 +1568,7 @@ format_overall_db_stats () {
[ -e "$file" ] || return [ -e "$file" ] || return
echo
awk ' awk '
BEGIN { BEGIN {
db = "{chosen}"; db = "{chosen}";
@@ -1838,6 +1839,7 @@ format_overall_db_stats () {
local hdr=$(grep -n Database "$tmpfile" | cut -d: -f1); local hdr=$(grep -n Database "$tmpfile" | cut -d: -f1);
head -n${hdr} "$tmpfile" head -n${hdr} "$tmpfile"
tail -n +$((${hdr} + 1)) "$tmpfile" | sort tail -n +$((${hdr} + 1)) "$tmpfile" | sort
echo
} }
section_percona_server_features () { section_percona_server_features () {
@@ -2719,6 +2721,7 @@ the percentage of the cache in use and the hit-to-insert ratio. The latter two
are fuzzy-rounded. are fuzzy-rounded.
# Schema ##################################################### # Schema #####################################################
Database Tables Views SPs Trigs Funcs FKs Partn Database Tables Views SPs Trigs Funcs FKs Partn
mysql 24 mysql 24
performance_schema 17 performance_schema 17

8
lib/bash/report_mysql_info.sh
View File

@@ -575,6 +575,7 @@ format_overall_db_stats () {
[ -e "$file" ] || return [ -e "$file" ] || return
echo
# We keep counts of everything in an associative array keyed by db name, and # We keep counts of everything in an associative array keyed by db name, and
# what it is. The num_dbs counter is to ensure sort order is consistent when # what it is. The num_dbs counter is to ensure sort order is consistent when
# we run the awk commands following this one. # we run the awk commands following this one.
@@ -860,6 +861,7 @@ format_overall_db_stats () {
local hdr=$(grep -n Database "$tmpfile" | cut -d: -f1); local hdr=$(grep -n Database "$tmpfile" | cut -d: -f1);
head -n${hdr} "$tmpfile" head -n${hdr} "$tmpfile"
tail -n +$((${hdr} + 1)) "$tmpfile" | sort tail -n +$((${hdr} + 1)) "$tmpfile" | sort
echo
} }
section_percona_server_features () { section_percona_server_features () {
@@ -1316,9 +1318,9 @@ report_mysql_summary () {
# Schema, databases, data type, other analysis. # Schema, databases, data type, other analysis.
# ######################################################################## # ########################################################################
section "Schema" section "Schema"
if [ "${OPT_DATABASES}" ] \ if [ "${OPT_DATABASES:-""}" ] \
|| [ "${OPT_ALL_DATABASES}" ] \ || [ "${OPT_ALL_DATABASES:-""}" ] \
|| [ "${OPT_READ_SAMPLES}" ]; then || [ "${OPT_READ_SAMPLES:-""}" ]; then
if [ -z "$OPT_READ_SAMPLES" ]; then if [ -z "$OPT_READ_SAMPLES" ]; then
# --databases or --all-databases was specified # --databases or --all-databases was specified