Updated innotop on debian/additions from 1.7.1 to 1.11.4

1 files changed, 302 insertions, 186 deletions

diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1
index fbb481f9b94..7cd275a79f2 100644
--- a/debian/additions/innotop/innotop.1
+++ b/debian/additions/innotop/innotop.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.07)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,6 +38,8 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -124,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "INNOTOP 1"
-.TH INNOTOP 1 "2009-03-09" "perl v5.10.0" "User Contributed Perl Documentation"
+.TH INNOTOP 1 "2017-01-23" "perl v5.20.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -210,7 +219,7 @@ To quit innotop, press the 'q' key.
 .IX Header "OPTIONS"
 innotop is mostly configured via its configuration file, but some of the
 configuration options can come from the command line.  You can also specify a
-file to monitor for InnoDB status output; see \*(L"\s-1MONITORING\s0 A \s-1FILE\s0\*(R" for more
+file to monitor for InnoDB status output; see \*(L"\s-1MONITORING A FILE\*(R"\s0 for more
 details.
 .PP
 You can negate some options by prefixing the option name with \-\-no.  For
@@ -249,7 +258,7 @@ Specifies the mode in which innotop should start.  Corresponds to the
 configuration option \*(L"mode\*(R".
 .IP "\-\-nonint" 4
 .IX Item "--nonint"
-Enable non-interactive operation.  See \*(L"NON-INTERACTIVE \s-1OPERATION\s0\*(R" for more.
+Enable non-interactive operation.  See \*(L"NON-INTERACTIVE \s-1OPERATION\*(R"\s0 for more.
 .IP "\-\-password" 4
 .IX Item "--password"
 Password to use for connection.
@@ -259,6 +268,11 @@ Port to use for connection.
 .IP "\-\-skipcentral" 4
 .IX Item "--skipcentral"
 Don't read the central configuration file.
+.IP "\-\-timestamp" 4
+.IX Item "--timestamp"
+In \-n mode, write a timestamp either before every screenful of output, or if
+the option is given twice, at the start of every line.  The format is controlled
+by the timeformat config variable.
 .IP "\-\-user" 4
 .IX Item "--user"
 User to use for connection.
@@ -289,10 +303,16 @@ the servers you're monitoring.  You switch between modes with uppercase keys.
 The following is a brief description of each mode, in alphabetical order.  To
 switch to the mode, press the key listed in front of its heading in the
 following list:
+.IP "A: Health Dashboard" 4
+.IX Item "A: Health Dashboard"
+This mode displays a single table with one row per monitored server. The
+columns show essential overview information about the server's health, and
+coloration rules show whether replication is running or if there are any very
+long-running queries or excessive replication delay.
 .IP "B: InnoDB Buffers" 4
 .IX Item "B: InnoDB Buffers"
 This mode displays information about the InnoDB buffer pool, page statistics,
-insert buffer, and adaptive hash index.  The data comes from \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.
+insert buffer, and adaptive hash index.  The data comes from \s-1SHOW INNODB STATUS.\s0
 .Sp
 This mode contains the \*(L"buffer_pool\*(R", \*(L"page_statistics\*(R",
 \&\*(L"insert_buffers\*(R", and \*(L"adaptive_hash_index\*(R" tables by default.
@@ -313,7 +333,7 @@ This mode is similar to mytop's Command Summary mode.  It shows the
 .Ve
 .Sp
 The command summary table is built by extracting variables from
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".  The variables must be numeric and must match the prefix
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.  The variables must be numeric and must match the prefix
 given by the \*(L"cmd_filter\*(R" configuration variable.  The variables are then
 sorted by value descending and compared to the last variable, as shown above.
 The percentage columns are percentage of the total of all variables in the
@@ -322,7 +342,7 @@ table, so you can see the relative weight of the variables.
 The example shows what you see if the prefix is \*(L"Select_\*(R".  The default
 prefix is \*(L"Com_\*(R".  You can choose a prefix with the 's' key.
 .Sp
-It's rather like running \s-1SHOW\s0 \s-1VARIABLES\s0 \s-1LIKE\s0 \*(L"prefix%\*(R" with memory and
+It's rather like running \s-1SHOW VARIABLES LIKE \s0\*(L"prefix%\*(R" with memory and
 nice formatting.
 .Sp
 Values are aggregated across all servers.  The Pct columns are not correctly
@@ -335,10 +355,10 @@ table shows the locks each transaction held and waited for.  A deadlock is
 caused by a cycle in the waits-for graph, so there should be two locks held and
 one waited for unless the deadlock information is truncated.
 .Sp
-InnoDB puts deadlock information before some other information in the \s-1SHOW\s0
-\&\s-1INNODB\s0 \s-1STATUS\s0 output.  If there are a lot of locks, the deadlock information can
-grow very large, and there is a limit on the size of the \s-1SHOW\s0 \s-1INNODB\s0
-\&\s-1STATUS\s0 output.  A large deadlock can fill the entire output, or even be
+InnoDB puts deadlock information before some other information in the \s-1SHOW
+INNODB STATUS\s0 output.  If there are a lot of locks, the deadlock information can
+grow very large, and there is a limit on the size of the \s-1SHOW INNODB
+STATUS\s0 output.  A large deadlock can fill the entire output, or even be
 truncated, and prevent you from seeing other information at all.  If you are
 running innotop in another mode, for example T mode, and suddenly you don't see
 anything, you might want to check and see if a deadlock has wiped out the data
@@ -346,8 +366,8 @@ you need.
 .Sp
 If it has, you can create a small deadlock to replace the large one.  Use the
 \&'w' key to 'wipe' the large deadlock with a small one.  This will not work
-unless you have defined a deadlock table for the connection (see \*(L"\s-1SERVER\s0
-\&\s-1CONNECTIONS\s0\*(R").
+unless you have defined a deadlock table for the connection (see \*(L"\s-1SERVER
+CONNECTIONS\*(R"\s0).
 .Sp
 You can also configure innotop to automatically detect when a large deadlock
 needs to be replaced with a small one (see \*(L"auto_wipe_dl\*(R").
@@ -371,6 +391,11 @@ This mode displays the \*(L"fk_error\*(R" table by default.
 This mode shows InnoDB's I/O statistics, including the I/O threads, pending I/O,
 file I/O miscellaneous, and log statistics.  It displays the \*(L"io_threads\*(R",
 \&\*(L"pending_io\*(R", \*(L"file_io_misc\*(R", and \*(L"log_statistics\*(R" tables by default.
+.IP "K: InnoDB Lock Waits" 4
+.IX Item "K: InnoDB Lock Waits"
+This mode shows information from InnoDB plugin's transaction and locking tables.
+You can use it to find when a transaction is waiting for another, and kill the
+blocking transaction. It displays the "innodb_blocked_blocker" table.
 .IP "L: Locks" 4
 .IX Item "L: Locks"
 This mode shows information about current locks.  At the moment only InnoDB
@@ -384,7 +409,7 @@ You can configure MySQL and innotop to monitor not only locks for which a
 transaction is waiting, but those currently held, too.  You can do this with the
 InnoDB Lock Monitor (<http://dev.mysql.com/doc/en/innodb\-monitor.html>).  It's
 not documented in the MySQL manual, but creating the lock monitor with the
-following statement also affects the output of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0, which innotop
+following statement also affects the output of \s-1SHOW INNODB STATUS,\s0 which innotop
 uses:
 .Sp
 .Vb 1
@@ -392,7 +417,7 @@ uses:
 .Ve
 .Sp
 This causes InnoDB to print its output to the MySQL file every 16 seconds or so,
-as stated in the manual, but it also makes the normal \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 output
+as stated in the manual, but it also makes the normal \s-1SHOW INNODB STATUS\s0 output
 include lock information, which innotop can parse and display (that's the
 undocumented feature).
 .Sp
@@ -414,13 +439,13 @@ the screen when one connection is waiting for locks another connection holds:
 \& localhost  11  RECORD        0  00:00   00:25  X     test  t1     PRIMARY
 .Ve
 .Sp
-You can see the first connection, \s-1ID\s0 12, is waiting for a lock on the \s-1PRIMARY\s0
+You can see the first connection, \s-1ID 12,\s0 is waiting for a lock on the \s-1PRIMARY\s0
 key on test.t1, and has been waiting for 10 seconds.  The second connection
 isn't waiting, because the Waiting column is 0, but it holds locks on the same
 index.  That tells you connection 11 is blocking connection 12.
 .IP "M: Master/Slave Replication Status" 4
 .IX Item "M: Master/Slave Replication Status"
-This mode shows the output of \s-1SHOW\s0 \s-1SLAVE\s0 \s-1STATUS\s0 and \s-1SHOW\s0 \s-1MASTER\s0 \s-1STATUS\s0 in three
+This mode shows the output of \s-1SHOW SLAVE STATUS\s0 and \s-1SHOW MASTER STATUS\s0 in three
 tables.  The first two divide the slave's status into \s-1SQL\s0 and I/O thread status,
 and the last shows master status.  Filters are applied to eliminate non-slave
 servers from the slave tables, and non-master servers from the master table.
@@ -429,15 +454,31 @@ This mode displays the \*(L"slave_sql_status\*(R", \*(L"slave_io_status\*(R", an
 \&\*(L"master_status\*(R" tables by default.
 .IP "O: Open Tables" 4
 .IX Item "O: Open Tables"
-This section comes from MySQL's \s-1SHOW\s0 \s-1OPEN\s0 \s-1TABLES\s0 command.  By default it is
+This section comes from MySQL's \s-1SHOW OPEN TABLES\s0 command.  By default it is
 filtered to show tables which are in use by one or more queries, so you can
 get a quick look at which tables are 'hot'.  You can use this to guess which
 tables might be locked implicitly.
 .Sp
 This mode displays the \*(L"open_tables\*(R" mode by default.
+.IP "U: User Statistics" 4
+.IX Item "U: User Statistics"
+This mode displays data that's available in Percona's enhanced version of MySQL
+(also known as Percona Server with XtraDB).  Specifically, it makes it easy to
+enable and disable the so-called \*(L"user statistics.\*(R"  This feature gathers stats
+on clients, threads, users, tables, and indexes and makes them available as
+\&\s-1INFORMATION_SCHEMA\s0 tables.  These are invaluable for understanding what your
+server is doing.  They are also available in MariaDB.
+.Sp
+The statistics supported so far are only from the \s-1TABLE_STATISTICS\s0 and
+\&\s-1INDEX_STATISTICS\s0 tables added by Percona.  There are three views: one of table stats,
+one of index stats (which can be aggregated with the = key), and one of both.
+.Sp
+The server doesn't gather these stats by default.  You have to set the variable
+userstat_running to turn it on.  You can do this easily with innotop from U mode,
+with the 's' key.
 .IP "Q: Query List" 4
 .IX Item "Q: Query List"
-This mode displays the output from \s-1SHOW\s0 \s-1FULL\s0 \s-1PROCESSLIST\s0, much like \fBmytop\fR's
+This mode displays the output from \s-1SHOW FULL PROCESSLIST,\s0 much like \fBmytop\fR's
 query list mode.  This mode does \fBnot\fR show InnoDB-related information.  This
 is probably one of the most useful modes for general usage.
 .Sp
@@ -447,8 +488,8 @@ innotop hides inactive processes and its own process.  You can toggle these on
 and off with the 'i' and 'a' keys.
 .Sp
 You can \s-1EXPLAIN\s0 a query from this mode with the 'e' key.  This displays the
-query's full text, the results of \s-1EXPLAIN\s0, and in newer MySQL versions, even
-the optimized query resulting from \s-1EXPLAIN\s0 \s-1EXTENDED\s0.  innotop also tries to
+query's full text, the results of \s-1EXPLAIN,\s0 and in newer MySQL versions, even
+the optimized query resulting from \s-1EXPLAIN EXTENDED. \s0 innotop also tries to
 rewrite certain queries to make them EXPLAIN-able.  For example, \s-1INSERT/SELECT\s0
 statements are rewritable.
 .Sp
@@ -503,7 +544,7 @@ depends on the mode you're in, and what servers you're monitoring.  The first
 few words are always [\s-1RO\s0] (if readonly is set to 1), the innotop mode, such as
 \&\*(L"InnoDB Txns\*(R" for T mode, followed by a reminder to press '?' for help at any
 time.
-.SS "\s-1ONE\s0 \s-1SERVER\s0"
+.SS "\s-1ONE SERVER\s0"
 .IX Subsection "ONE SERVER"
 The simplest case is when you're monitoring a single server.  In this case, the
 name of the connection is next on the status line.  This is the name you gave
@@ -511,9 +552,9 @@ when you created the connection \*(-- most likely the MySQL server's hostname.
 This is followed by the server's uptime.
 .PP
 If you're in an InnoDB mode, such as T or B, the next word is \*(L"InnoDB\*(R" followed
-by some information about the \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 output used to render the
-screen.  The first word is the number of seconds since the last \s-1SHOW\s0 \s-1INNODB\s0
-\&\s-1STATUS\s0, which InnoDB uses to calculate some per-second statistics.  The next is
+by some information about the \s-1SHOW INNODB STATUS\s0 output used to render the
+screen.  The first word is the number of seconds since the last \s-1SHOW INNODB
+STATUS,\s0 which InnoDB uses to calculate some per-second statistics.  The next is
 a smiley face indicating whether the InnoDB output is truncated.  If the smiley
 face is a :\-), all is well; there is no truncation.  A :^| means the transaction
 list is so long, InnoDB has only printed out some of the transactions.  Finally,
@@ -523,21 +564,21 @@ printing too much lock information (see \*(L"D: InnoDB Deadlocks\*(R").
 The next two words indicate the server's queries per second (\s-1QPS\s0) and how many
 threads (connections) exist.  Finally, the server's version number is the last
 thing on the line.
-.SS "\s-1MULTIPLE\s0 \s-1SERVERS\s0"
+.SS "\s-1MULTIPLE SERVERS\s0"
 .IX Subsection "MULTIPLE SERVERS"
-If you are monitoring multiple servers (see \*(L"\s-1SERVER\s0 \s-1CONNECTIONS\s0\*(R"), the status
+If you are monitoring multiple servers (see \*(L"\s-1SERVER CONNECTIONS\*(R"\s0), the status
 line does not show any details about individual servers.  Instead, it shows the
 names of the connections that are active.  Again, these are connection names you
 specified, which are likely to be the server's hostname.  A connection that has
 an error is prefixed with an exclamation point.
 .PP
-If you are monitoring a group of servers (see \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R"), the status
+If you are monitoring a group of servers (see \*(L"\s-1SERVER GROUPS\*(R"\s0), the status
 line shows the name of the group.  If any connection in the group has an
 error, the group's name is followed by the fraction of the connections that
 don't have errors.
 .PP
-See \*(L"\s-1ERROR\s0 \s-1HANDLING\s0\*(R" for more details about innotop's error handling.
-.SS "\s-1MONITORING\s0 A \s-1FILE\s0"
+See \*(L"\s-1ERROR HANDLING\*(R"\s0 for more details about innotop's error handling.
+.SS "\s-1MONITORING A FILE\s0"
 .IX Subsection "MONITORING A FILE"
 If you give a filename on the command line, innotop will not connect to \s-1ANY\s0
 servers at all.  It will watch the specified file for InnoDB status output and
@@ -553,7 +594,7 @@ commands are killing queries and stopping or starting slaves.
 .PP
 You can kill a connection, or in newer versions of MySQL kill a query but not a
 connection, from \*(L"Q: Query List\*(R" and \*(L"T: InnoDB Transactions\*(R" modes.
-Press 'k' to issue a \s-1KILL\s0 command, or 'x' to issue a \s-1KILL\s0 \s-1QUERY\s0 command.
+Press 'k' to issue a \s-1KILL\s0 command, or 'x' to issue a \s-1KILL QUERY\s0 command.
 innotop will prompt you for the server and/or connection \s-1ID\s0 to kill (innotop
 does not prompt you if there is only one possible choice for any input).
 innotop pre-selects the longest-running query, or the oldest connection.
@@ -561,17 +602,20 @@ Confirm the command with 'y'.
 .PP
 In \*(L"Slave Replication Status\*(R"\*(L" in \*(R"M: Master mode, you can start and stop slaves
 with the 'a' and 'o' keys, respectively.  You can send these commands to many
-slaves at once.  innotop fills in a default command of \s-1START\s0 \s-1SLAVE\s0 or \s-1STOP\s0 \s-1SLAVE\s0
+slaves at once.  innotop fills in a default command of \s-1START SLAVE\s0 or \s-1STOP SLAVE\s0
 for you, but you can actually edit the command and send anything you wish, such
-as \s-1SET\s0 \s-1GLOBAL\s0 SQL_SLAVE_SKIP_COUNTER=1 to make the slave skip one binlog event
+as \s-1SET GLOBAL\s0 SQL_SLAVE_SKIP_COUNTER=1 to make the slave skip one binlog event
 when it starts.
 .PP
 You can also ask innotop to calculate the earliest binlog in use by any slave
-and issue a \s-1PURGE\s0 \s-1MASTER\s0 \s-1LOGS\s0 on the master.  Use the 'b' key for this.  innotop
+and issue a \s-1PURGE MASTER LOGS\s0 on the master.  Use the 'b' key for this.  innotop
 will prompt you for a master to run the command on, then prompt you for the
 connection names of that master's slaves (there is no way for innotop to
 determine this reliably itself).  innotop will find the minimum binlog in use by
-these slave connections and suggest it as the argument to \s-1PURGE\s0 \s-1MASTER\s0 \s-1LOGS\s0.
+these slave connections and suggest it as the argument to \s-1PURGE MASTER LOGS.\s0
+.PP
+in \*(L"U: User Statistics\*(R" mode, you can use the 's' key to start and stop
+the collection of the statistics data for \s-1TABLE_STATISTICS\s0 and similar.
 .SH "SERVER CONNECTIONS"
 .IX Header "SERVER CONNECTIONS"
 When you create a server connection using '@', innotop asks you for a series of
@@ -587,7 +631,7 @@ module for connecting to a server.  It is usually of the form
 .Sp
 Since this \s-1DSN\s0 is passed to the DBD::mysql driver, you should read the driver's
 documentation at \*(L"/search.cpan.org/dist/DBD\-mysql/lib/DBD/mysql.pm\*(R"\*(L" in \*(R"http: for
-the exact details on all the options you can pass the driver in the \s-1DSN\s0.  You
+the exact details on all the options you can pass the driver in the \s-1DSN. \s0 You
 can read more about \s-1DBI\s0 at <http://dbi.perl.org/docs/>, and especially at
 <http://search.cpan.org/~timb/DBI/DBI.pm>.
 .Sp
@@ -620,7 +664,7 @@ not encrypted in any way.
 Once you finish answering these questions, you should be connected to a server.
 But innotop isn't limited to monitoring a single server; you can define many
 server connections and switch between them by pressing the '@' key.  See
-\&\*(L"\s-1SWITCHING\s0 \s-1BETWEEN\s0 \s-1CONNECTIONS\s0\*(R".
+\&\*(L"\s-1SWITCHING BETWEEN CONNECTIONS\*(R"\s0.
 .SH "SERVER GROUPS"
 .IX Header "SERVER GROUPS"
 If you have multiple MySQL instances, you can put them into named groups, such
@@ -640,7 +684,7 @@ want to use.  This setting is per-mode, so you can monitor different connections
 in each mode, and innotop remembers which connections you choose.
 .PP
 You can quickly switch to the 'next' connection in alphabetical order with the
-\&'n' key.  If you're monitoring a server group (see \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R") this will
+\&'n' key.  If you're monitoring a server group (see \*(L"\s-1SERVER GROUPS\*(R"\s0) this will
 switch to the first connection.
 .PP
 You can also type many connection names, and innotop will fetch and display data
@@ -658,7 +702,7 @@ monitoring a large group or many connections, you may notice increased delay
 between ticks.
 .PP
 When you monitor more than one connection, innotop's status bar changes.  See
-\&\*(L"\s-1INNOTOP\s0 \s-1STATUS\s0\*(R".
+\&\*(L"\s-1INNOTOP STATUS\*(R"\s0.
 .SH "ERROR HANDLING"
 .IX Header "ERROR HANDLING"
 Error handling is not that important when monitoring a single connection, but is
@@ -711,7 +755,7 @@ tick, so innotop may appear to hang.
 .IP "\(bu" 4
 innotop only displays the first table in each mode.  This is so the output can
 be easily processed with other command-line utilities such as awk and sed.  To
-change which tables display in each mode, see \*(L"\s-1TABLES\s0\*(R".  Since \*(L"Q: Query
+change which tables display in each mode, see \*(L"\s-1TABLES\*(R"\s0.  Since \*(L"Q: Query
 List\*(R" mode is so important, innotop automatically disables the \*(L"q_header\*(R"
 table.  This ensures you'll see the \*(L"processlist\*(R" table, even if you have
 innotop configured to show the q_header table during interactive operation.
@@ -730,7 +774,7 @@ output.
 innotop does not honor the \*(L"shorten\*(R" transformation, which normally shortens
 some numbers to human-readable formats.
 .IP "\(bu" 4
-innotop does not print a status line (see \*(L"\s-1INNOTOP\s0 \s-1STATUS\s0\*(R").
+innotop does not print a status line (see \*(L"\s-1INNOTOP STATUS\*(R"\s0).
 .SH "CONFIGURING"
 .IX Header "CONFIGURING"
 Nearly everything about innotop is configurable.  Most things are possible to
@@ -741,17 +785,17 @@ dialog.  Press another key to select the type of data you want to edit:
 .IP "S: Statement Sleep Times" 4
 .IX Item "S: Statement Sleep Times"
 Edits \s-1SQL\s0 statement sleep delays, which make innotop pause for the specified
-amount of time after executing a statement.  See \*(L"\s-1SQL\s0 \s-1STATEMENTS\s0\*(R" for a
+amount of time after executing a statement.  See \*(L"\s-1SQL STATEMENTS\*(R"\s0 for a
 definition of each statement and what it does.  By default innotop does not
 delay after any statements.
 .Sp
 This feature is included so you can customize the side-effects caused by
 monitoring your server.  You may not see any effects, but some innotop users
 have noticed that certain MySQL versions under very high load with InnoDB
-enabled take longer than usual to execute \s-1SHOW\s0 \s-1GLOBAL\s0 \s-1STATUS\s0.  If innotop calls
-\&\s-1SHOW\s0 \s-1FULL\s0 \s-1PROCESSLIST\s0 immediately afterward, the processlist contains more
+enabled take longer than usual to execute \s-1SHOW GLOBAL STATUS. \s0 If innotop calls
+\&\s-1SHOW FULL PROCESSLIST\s0 immediately afterward, the processlist contains more
 queries than the machine actually averages at any given moment.  Configuring
-innotop to pause briefly after calling \s-1SHOW\s0 \s-1GLOBAL\s0 \s-1STATUS\s0 alleviates this
+innotop to pause briefly after calling \s-1SHOW GLOBAL STATUS\s0 alleviates this
 effect.
 .Sp
 Sleep times are stored in the \*(L"stmt_sleep_times\*(R" section of the configuration
@@ -759,28 +803,28 @@ file.  Fractional-second sleeps are supported, subject to your hardware's
 limitations.
 .IP "c: Edit Columns" 4
 .IX Item "c: Edit Columns"
-Starts the table editor on one of the displayed tables.  See \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R".
+Starts the table editor on one of the displayed tables.  See \*(L"\s-1TABLE EDITOR\*(R"\s0.
 An alternative way to start the table editor without entering the configuration
 dialog is with the '^' key.
 .IP "g: General Configuration" 4
 .IX Item "g: General Configuration"
 Starts the configuration editor to edit global and mode-specific configuration
-variables (see \*(L"\s-1MODES\s0\*(R").  innotop prompts you to choose a variable from among
+variables (see \*(L"\s-1MODES\*(R"\s0).  innotop prompts you to choose a variable from among
 the global and mode-specific ones depending on the current mode.
 .IP "k: Row-Coloring Rules" 4
 .IX Item "k: Row-Coloring Rules"
 Starts the row-coloring rules editor on one of the displayed table(s).  See
-\&\*(L"\s-1COLORS\s0\*(R" for details.
+\&\*(L"\s-1COLORS\*(R"\s0 for details.
 .IP "p: Manage Plugins" 4
 .IX Item "p: Manage Plugins"
-Starts the plugin configuration editor.  See \*(L"\s-1PLUGINS\s0\*(R" for details.
+Starts the plugin configuration editor.  See \*(L"\s-1PLUGINS\*(R"\s0 for details.
 .IP "s: Server Groups" 4
 .IX Item "s: Server Groups"
-Lets you create and edit server groups.  See \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R".
+Lets you create and edit server groups.  See \*(L"\s-1SERVER GROUPS\*(R"\s0.
 .IP "t: Choose Displayed Tables" 4
 .IX Item "t: Choose Displayed Tables"
-Lets you choose which tables to display in this mode.  See \*(L"\s-1MODES\s0\*(R" and
-\&\*(L"\s-1TABLES\s0\*(R".
+Lets you choose which tables to display in this mode.  See \*(L"\s-1MODES\*(R"\s0 and
+\&\*(L"\s-1TABLES\*(R"\s0.
 .SH "CONFIGURATION FILE"
 .IX Header "CONFIGURATION FILE"
 innotop's default configuration file locations are \f(CW$HOME\fR/.innotop and
@@ -829,7 +873,7 @@ graphed; if s, values are like vmstat; if p, values are in a pivoted table.
 .IP "S_set" 4
 .IX Item "S_set"
 Specifies which set of variables to display in \*(L"S: Variables & Status\*(R" mode.
-See \*(L"\s-1VARIABLE\s0 \s-1SETS\s0\*(R".
+See \*(L"\s-1VARIABLE SETS\*(R"\s0.
 .IP "auto_wipe_dl" 4
 .IX Item "auto_wipe_dl"
 Instructs innotop to automatically wipe large deadlocks when it notices them.
@@ -866,7 +910,7 @@ crash.
 .IP "debugfile" 4
 .IX Item "debugfile"
 A file to which innotop will write information when there is a crash.  See
-\&\*(L"\s-1FILES\s0\*(R".
+\&\*(L"\s-1FILES\*(R"\s0.
 .IP "display_table_captions" 4
 .IX Item "display_table_captions"
 innotop displays a table caption above most tables.  This variable suppresses or
@@ -875,7 +919,7 @@ hide_caption property, which overrides this.
 .IP "global" 4
 .IX Item "global"
 Whether to show \s-1GLOBAL\s0 variables and status.  innotop only tries to do this on
-servers which support the \s-1GLOBAL\s0 option to \s-1SHOW\s0 \s-1VARIABLES\s0 and \s-1SHOW\s0 \s-1STATUS\s0.  In
+servers which support the \s-1GLOBAL\s0 option to \s-1SHOW VARIABLES\s0 and \s-1SHOW STATUS. \s0 In
 some MySQL versions, you need certain privileges to do this; if you don't have
 them, innotop will not be able to fetch any variable and status data.  This
 configuration variable lets you run innotop and fetch what data you can even
@@ -904,7 +948,7 @@ This variable accepts fractions of a second.
 .IP "mode" 4
 .IX Item "mode"
 The mode in which innotop should start.  Allowable arguments are the same as the
-key presses that select a mode interactively.  See \*(L"\s-1MODES\s0\*(R".
+key presses that select a mode interactively.  See \*(L"\s-1MODES\*(R"\s0.
 .IP "num_digits" 4
 .IX Item "num_digits"
 How many digits to show in fractional numbers and percents.  This variable's
@@ -926,24 +970,28 @@ Specifies where plugins can be found.  By default, innotop stores plugins in the
 Whether the configuration file is readonly.  This cannot be set interactively.
 .IP "show_cxn_errors" 4
 .IX Item "show_cxn_errors"
-Makes innotop print connection errors to \s-1STDOUT\s0.  See \*(L"\s-1ERROR\s0 \s-1HANDLING\s0\*(R".
+Makes innotop print connection errors to \s-1STDOUT. \s0 See \*(L"\s-1ERROR HANDLING\*(R"\s0.
 .IP "show_cxn_errors_in_tbl" 4
 .IX Item "show_cxn_errors_in_tbl"
 Makes innotop display connection errors as rows in the first table on screen.
-See \*(L"\s-1ERROR\s0 \s-1HANDLING\s0\*(R".
+See \*(L"\s-1ERROR HANDLING\*(R"\s0.
 .IP "show_percent" 4
 .IX Item "show_percent"
 Adds a '%' character after the value returned by the \*(L"percent\*(R"
 transformation.
 .IP "show_statusbar" 4
 .IX Item "show_statusbar"
-Controls whether to show the status bar in the display.  See \*(L"\s-1INNOTOP\s0
-\&\s-1STATUS\s0\*(R".
+Controls whether to show the status bar in the display.  See \*(L"\s-1INNOTOP
+STATUS\*(R"\s0.
 .IP "skip_innodb" 4
 .IX Item "skip_innodb"
-Disables fetching \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0, in case your server(s) do not have InnoDB
+Disables fetching \s-1SHOW INNODB STATUS,\s0 in case your server(s) do not have InnoDB
 enabled and you don't want innotop to try to fetch it.  This can also be useful
-when you don't have the \s-1SUPER\s0 privilege, required to run \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.
+when you don't have the \s-1SUPER\s0 privilege, required to run \s-1SHOW INNODB STATUS.\s0
+.IP "spark" 4
+.IX Item "spark"
+Specifies how wide a spark chart is. There are two \s-1ASCII\s0 spark charts in A
+mode, showing \s-1QPS\s0 and User_threads_running.
 .IP "status_inc" 4
 .IX Item "status_inc"
 Whether to show absolute or incremental values for status variables.
@@ -951,16 +999,20 @@ Incremental values are calculated as an offset from the last value innotop saw
 for that variable.  This is a global setting, but will probably become
 mode-specific at some point.  Right now it is honored a bit inconsistently; some
 modes don't pay attention to it.
+.IP "timeformat" 4
+.IX Item "timeformat"
+The C\-style \fIstrftime()\fR\-compatible format for the timestamp line to be printed
+in \-n mode when \-t is set.
 .RE
 .RS 4
 .RE
 .IP "plugins" 4
 .IX Item "plugins"
 This section holds a list of package names of active plugins.  If the plugin
-exists, innotop will activate it.  See \*(L"\s-1PLUGINS\s0\*(R" for more information.
+exists, innotop will activate it.  See \*(L"\s-1PLUGINS\*(R"\s0 for more information.
 .IP "filters" 4
 .IX Item "filters"
-This section holds user-defined filters (see \*(L"\s-1FILTERS\s0\*(R").  Each line is in the
+This section holds user-defined filters (see \*(L"\s-1FILTERS\*(R"\s0).  Each line is in the
 format filter_name=text='filter text' tbls='table list'.
 .Sp
 The filter text is the text of the subroutine's code.  The table list is a list
@@ -973,7 +1025,7 @@ This section stores which filters are active on each table.  Each line is in the
 format table_name=filter_list.
 .IP "tbl_meta" 4
 .IX Item "tbl_meta"
-This section stores user-defined or user-customized columns (see \*(L"\s-1COLUMNS\s0\*(R").
+This section stores user-defined or user-customized columns (see \*(L"\s-1COLUMNS\*(R"\s0).
 Each line is in the format col_name=properties, where the properties are a
 name=quoted\-value list.
 .IP "connections" 4
@@ -982,8 +1034,8 @@ This section holds the server connections you have defined.  Each line is in
 the format name=properties, where the properties are a name=value list.  The
 properties are self-explanatory, and the only one that is treated specially is
 \&'pass' which is only present if 'savepass' is set.  This section of the
-configuration file will be skipped if any \s-1DSN\s0, username, or password
-command-line options are used.  See \*(L"\s-1SERVER\s0 \s-1CONNECTIONS\s0\*(R".
+configuration file will be skipped if any \s-1DSN,\s0 username, or password
+command-line options are used.  See \*(L"\s-1SERVER CONNECTIONS\*(R"\s0.
 .IP "active_connections" 4
 .IX Item "active_connections"
 This section holds a list of which connections are active in each mode.  Each
@@ -991,7 +1043,7 @@ line is in the format mode_name=connection_list.
 .IP "server_groups" 4
 .IX Item "server_groups"
 This section holds server groups.  Each line is in the format
-name=connection_list.  See \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R".
+name=connection_list.  See \*(L"\s-1SERVER GROUPS\*(R"\s0.
 .IP "active_server_groups" 4
 .IX Item "active_server_groups"
 This section holds a list of which server group is active in each mode.  Each
@@ -1004,24 +1056,24 @@ name=value.
 .IP "active_columns" 4
 .IX Item "active_columns"
 This section holds table column lists.  Each line is in the format
-tbl_name=column_list.  See \*(L"\s-1COLUMNS\s0\*(R".
+tbl_name=column_list.  See \*(L"\s-1COLUMNS\*(R"\s0.
 .IP "sort_cols" 4
 .IX Item "sort_cols"
 This section holds the sort definition.  Each line is in the format
 tbl_name=column_list.  If a column is prefixed with '\-', that column sorts
-descending.  See \*(L"\s-1SORTING\s0\*(R".
+descending.  See \*(L"\s-1SORTING\*(R"\s0.
 .IP "visible_tables" 4
 .IX Item "visible_tables"
 This section defines which tables are visible in each mode.  Each line is in the
-format mode_name=table_list.  See \*(L"\s-1TABLES\s0\*(R".
+format mode_name=table_list.  See \*(L"\s-1TABLES\*(R"\s0.
 .IP "varsets" 4
 .IX Item "varsets"
 This section defines variable sets for use in \*(L"S: Status & Variables\*(R" mode.
-Each line is in the format name=variable_list.  See \*(L"\s-1VARIABLE\s0 \s-1SETS\s0\*(R".
+Each line is in the format name=variable_list.  See \*(L"\s-1VARIABLE SETS\*(R"\s0.
 .IP "colors" 4
 .IX Item "colors"
 This section defines colorization rules.  Each line is in the format
-tbl_name=property_list.  See \*(L"\s-1COLORS\s0\*(R".
+tbl_name=property_list.  See \*(L"\s-1COLORS\*(R"\s0.
 .IP "stmt_sleep_times" 4
 .IX Item "stmt_sleep_times"
 This section contains statement sleep times.  Each line is in the format
@@ -1029,7 +1081,7 @@ statement_name=sleep_time.  See \*(L"S: Statement Sleep Times\*(R".
 .IP "group_by" 4
 .IX Item "group_by"
 This section contains column lists for table group_by expressions.  Each line is
-in the format tbl_name=column_list.  See \*(L"\s-1GROUPING\s0\*(R".
+in the format tbl_name=column_list.  See \*(L"\s-1GROUPING\*(R"\s0.
 .SH "CUSTOMIZING"
 .IX Header "CUSTOMIZING"
 You can customize innotop a great deal.  For example, you can:
@@ -1065,10 +1117,10 @@ instructions to innotop.  The meta-data includes the caption, a list of columns
 the user has customized, a list of columns, a list of visible columns, a list of
 filters, color rules, a sort-column list, sort direction, and some information
 about the table's data sources.  Most of this is customizable via the table
-editor (see \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R").
+editor (see \*(L"\s-1TABLE EDITOR\*(R"\s0).
 .PP
-You can choose which tables to show by pressing the '$' key.  See \*(L"\s-1MODES\s0\*(R" and
-\&\*(L"\s-1TABLES\s0\*(R".
+You can choose which tables to show by pressing the '$' key.  See \*(L"\s-1MODES\*(R"\s0 and
+\&\*(L"\s-1TABLES\*(R"\s0.
 .PP
 The table life-cycle is as follows:
 .IP "\(bu" 4
@@ -1081,21 +1133,21 @@ For each element in the data source, innotop extracts values from the source and
 creates a row.  This row is another hash, which later steps will refer to as
 \&\f(CW$set\fR.  The values innotop extracts are determined by the table's columns.  Each
 column has an extraction subroutine, compiled from an expression (see
-\&\*(L"\s-1EXPRESSIONS\s0\*(R").  The resulting row is a hash whose keys are named the same as
+\&\*(L"\s-1EXPRESSIONS\*(R"\s0).  The resulting row is a hash whose keys are named the same as
 the column name.
 .IP "\(bu" 4
 innotop filters the rows, removing those that don't need to be displayed.  See
-\&\*(L"\s-1FILTERS\s0\*(R".
+\&\*(L"\s-1FILTERS\*(R"\s0.
 .IP "\(bu" 4
-innotop sorts the rows.  See \*(L"\s-1SORTING\s0\*(R".
+innotop sorts the rows.  See \*(L"\s-1SORTING\*(R"\s0.
 .IP "\(bu" 4
-innotop groups the rows together, if specified.  See \*(L"\s-1GROUPING\s0\*(R".
+innotop groups the rows together, if specified.  See \*(L"\s-1GROUPING\*(R"\s0.
 .IP "\(bu" 4
-innotop colorizes the rows.  See \*(L"\s-1COLORS\s0\*(R".
+innotop colorizes the rows.  See \*(L"\s-1COLORS\*(R"\s0.
 .IP "\(bu" 4
-innotop transforms the column values in each row.  See \*(L"\s-1TRANSFORMATIONS\s0\*(R".
+innotop transforms the column values in each row.  See \*(L"\s-1TRANSFORMATIONS\*(R"\s0.
 .IP "\(bu" 4
-innotop optionally pivots the rows (see \*(L"\s-1PIVOTING\s0\*(R"), then filters and sorts
+innotop optionally pivots the rows (see \*(L"\s-1PIVOTING\*(R"\s0), then filters and sorts
 them.
 .IP "\(bu" 4
 innotop formats and justifies the rows as a table.  During this step, innotop
@@ -1108,7 +1160,7 @@ The lifecycle is slightly different if the table is pivoted, as noted above.  To
 clarify, if the table is pivoted, the process is extract, group, transform,
 pivot, filter, sort, create.  If it's not pivoted, the process is extract,
 filter, sort, group, color, transform, create.  This slightly convoluted process
-doesn't map all that well to \s-1SQL\s0, but pivoting complicates things pretty
+doesn't map all that well to \s-1SQL,\s0 but pivoting complicates things pretty
 thoroughly.  Roughly speaking, filtering and sorting happen as late as needed to
 effect the final result as you might expect, but as early as possible for
 efficiency.
@@ -1117,99 +1169,119 @@ Each built-in table is described below:
 .IP "adaptive_hash_index" 4
 .IX Item "adaptive_hash_index"
 Displays data about InnoDB's adaptive hash index.  Data source:
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "buffer_pool" 4
 .IX Item "buffer_pool"
-Displays data about InnoDB's buffer pool.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays data about InnoDB's buffer pool.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "cmd_summary" 4
 .IX Item "cmd_summary"
-Displays weighted status variables.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays weighted status variables.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "deadlock_locks" 4
 .IX Item "deadlock_locks"
 Shows which locks were held and waited for by the last detected deadlock.  Data
-source: \*(L"\s-1DEADLOCK_LOCKS\s0\*(R".
+source: \*(L"\s-1DEADLOCK_LOCKS\*(R"\s0.
 .IP "deadlock_transactions" 4
 .IX Item "deadlock_transactions"
 Shows transactions involved in the last detected deadlock.  Data source:
-\&\*(L"\s-1DEADLOCK_TRANSACTIONS\s0\*(R".
+\&\*(L"\s-1DEADLOCK_TRANSACTIONS\*(R"\s0.
 .IP "explain" 4
 .IX Item "explain"
-Shows the output of \s-1EXPLAIN\s0.  Data source: \*(L"\s-1EXPLAIN\s0\*(R".
+Shows the output of \s-1EXPLAIN. \s0 Data source: \*(L"\s-1EXPLAIN\*(R"\s0.
 .IP "file_io_misc" 4
 .IX Item "file_io_misc"
 Displays data about InnoDB's file and I/O operations.  Data source:
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "fk_error" 4
 .IX Item "fk_error"
 Displays various data about InnoDB's last foreign key error.  Data source:
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
+.IP "health_dashboard" 4
+.IX Item "health_dashboard"
+Displays an overall summary of servers, one server per line, for monitoring.
+Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0, \*(L"\s-1MASTER_SLAVE\*(R"\s0, \*(L"\s-1PROCESSLIST_STATS\*(R"\s0.
+.IP "index_statistics" 4
+.IX Item "index_statistics"
+Displays data from the \s-1INDEX_STATISTICS\s0 table in Percona-enhanced servers.
+.IP "index_table_statistics" 4
+.IX Item "index_table_statistics"
+Displays data from the \s-1INDEX_STATISTICS\s0 and \s-1TABLE_STATISTICS\s0 tables in
+Percona-enhanced servers.  It joins the two together, grouped by the database
+and table name.  It is the default view in \*(L"U: User Statistics\*(R" mode,
+and makes it easy to see what tables are hot, how many rows are read from indexes,
+how many changes are made, and how many changes are made to indexes.
+.IP "innodb_blocked_blocker" 4
+.IX Item "innodb_blocked_blocker"
+Displays InnoDB locks and lock waits. Data source: \*(L"\s-1INNODB_BLOCKED_BLOCKER\*(R"\s0.
 .IP "innodb_locks" 4
 .IX Item "innodb_locks"
-Displays InnoDB locks.  Data source: \*(L"\s-1INNODB_LOCKS\s0\*(R".
+Displays InnoDB locks.  Data source: \*(L"\s-1INNODB_LOCKS\*(R"\s0.
 .IP "innodb_transactions" 4
 .IX Item "innodb_transactions"
 Displays data about InnoDB's current transactions.  Data source:
-\&\*(L"\s-1INNODB_TRANSACTIONS\s0\*(R".
+\&\*(L"\s-1INNODB_TRANSACTIONS\*(R"\s0.
 .IP "insert_buffers" 4
 .IX Item "insert_buffers"
-Displays data about InnoDB's insert buffer.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays data about InnoDB's insert buffer.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "io_threads" 4
 .IX Item "io_threads"
-Displays data about InnoDB's I/O threads.  Data source: \*(L"\s-1IO_THREADS\s0\*(R".
+Displays data about InnoDB's I/O threads.  Data source: \*(L"\s-1IO_THREADS\*(R"\s0.
 .IP "log_statistics" 4
 .IX Item "log_statistics"
-Displays data about InnoDB's logging system.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays data about InnoDB's logging system.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "master_status" 4
 .IX Item "master_status"
-Displays replication master status.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays replication master status.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "open_tables" 4
 .IX Item "open_tables"
-Displays open tables.  Data source: \*(L"\s-1OPEN_TABLES\s0\*(R".
+Displays open tables.  Data source: \*(L"\s-1OPEN_TABLES\*(R"\s0.
 .IP "page_statistics" 4
 .IX Item "page_statistics"
-Displays InnoDB page statistics.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays InnoDB page statistics.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "pending_io" 4
 .IX Item "pending_io"
-Displays InnoDB pending I/O operations.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays InnoDB pending I/O operations.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "processlist" 4
 .IX Item "processlist"
 Displays current MySQL processes (threads/connections).  Data source:
-\&\*(L"\s-1PROCESSLIST\s0\*(R".
+\&\*(L"\s-1PROCESSLIST\*(R"\s0.
 .IP "q_header" 4
 .IX Item "q_header"
-Displays various status values.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays various status values.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "row_operation_misc" 4
 .IX Item "row_operation_misc"
 Displays data about InnoDB's row operations.  Data source:
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "row_operations" 4
 .IX Item "row_operations"
 Displays data about InnoDB's row operations.  Data source:
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "semaphores" 4
 .IX Item "semaphores"
 Displays data about InnoDB's semaphores and mutexes.  Data source:
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "slave_io_status" 4
 .IX Item "slave_io_status"
 Displays data about the slave I/O thread.  Data source: 
-\&\*(L"\s-1STATUS_VARIABLES\s0\*(R".
+\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "slave_sql_status" 4
 .IX Item "slave_sql_status"
-Displays data about the slave \s-1SQL\s0 thread.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays data about the slave \s-1SQL\s0 thread.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
+.IP "table_statistics" 4
+.IX Item "table_statistics"
+Displays data from the \s-1TABLE_STATISTICS\s0 table in Percona-enhanced servers.
 .IP "t_header" 4
 .IX Item "t_header"
-Displays various InnoDB status values.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays various InnoDB status values.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "var_status" 4
 .IX Item "var_status"
-Displays user-configurable data.  Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R".
+Displays user-configurable data.  Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0.
 .IP "wait_array" 4
 .IX Item "wait_array"
-Displays data about InnoDB's \s-1OS\s0 wait array.  Data source: \*(L"\s-1OS_WAIT_ARRAY\s0\*(R".
+Displays data about InnoDB's \s-1OS\s0 wait array.  Data source: \*(L"\s-1OS_WAIT_ARRAY\*(R"\s0.
 .SS "\s-1COLUMNS\s0"
 .IX Subsection "COLUMNS"
 Columns belong to tables.  You can choose a table's columns by pressing the '^'
-key, which starts the \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R" and lets you choose and edit columns.
+key, which starts the \*(L"\s-1TABLE EDITOR\*(R"\s0 and lets you choose and edit columns.
 Pressing 'e' from within the table editor lets you edit the column's properties:
 .IP "\(bu" 4
 hdr: a column header.  This appears in the first row of the table.
@@ -1226,28 +1298,30 @@ label: a small note about the column, which appears in dialogs that help the
 user choose columns.
 .IP "\(bu" 4
 src: an expression that innotop uses to extract the column's data from its
-source (see \*(L"\s-1DATA\s0 \s-1SOURCES\s0\*(R").  See \*(L"\s-1EXPRESSIONS\s0\*(R" for more on expressions.
+source (see \*(L"\s-1DATA SOURCES\*(R"\s0).  See \*(L"\s-1EXPRESSIONS\*(R"\s0 for more on expressions.
 .IP "\(bu" 4
 minw: specifies a minimum display width.  This helps stabilize the display,
 which makes it easier to read if the data is changing frequently.
 .IP "\(bu" 4
 maxw: similar to minw.
 .IP "\(bu" 4
-trans: a list of column transformations.  See \*(L"\s-1TRANSFORMATIONS\s0\*(R".
+trans: a list of column transformations.  See \*(L"\s-1TRANSFORMATIONS\*(R"\s0.
 .IP "\(bu" 4
-agg: an aggregate function.  See \*(L"\s-1GROUPING\s0\*(R".  The default is \*(L"first\*(R".
+agg: an aggregate function.  See \*(L"\s-1GROUPING\*(R"\s0.  The default is \*(L"first\*(R".
 .IP "\(bu" 4
 aggonly: controls whether the column only shows when grouping is enabled on the
-table (see \*(L"\s-1GROUPING\s0\*(R").  By default, this is disabled.  This means columns
+table (see \*(L"\s-1GROUPING\*(R"\s0).  By default, this is disabled.  This means columns
 will always be shown by default, whether grouping is enabled or not.  If a
 column's aggonly is set true, the column will appear when you toggle grouping on
 the table.  Several columns are set this way, such as the count column on
 \&\*(L"processlist\*(R" and \*(L"innodb_transactions\*(R", so you don't see a count when the
 grouping isn't enabled, but you do when it is.
+.IP "\(bu" 4
+agghide: the reverse of aggonly.  The column is hidden when grouping is enabled.
 .SS "\s-1FILTERS\s0"
 .IX Subsection "FILTERS"
 Filters remove rows from the display.  They behave much like a \s-1WHERE\s0 clause in
-\&\s-1SQL\s0.  innotop has several built-in filters, which remove irrelevant information
+\&\s-1SQL. \s0 innotop has several built-in filters, which remove irrelevant information
 like inactive queries, but you can define your own as well.  innotop also lets
 you create quick-filters, which do not get saved to the configuration file, and
 are just an easy way to quickly view only some rows.
@@ -1297,11 +1371,30 @@ persist when you restart innotop.  To create a quick-filter, press the '/' key.
 innotop will prompt you for the column name and filter text.  Again, you can use
 auto-completion on column names.  The filter text can be just the text you want
 to \*(L"search for.\*(R"  For example, to filter the \*(L"processlist\*(R" table on queries
-that refer to the products table, type '/' and then 'info product'.
+that refer to the products table, type '/' and then 'info product'.  Internally,
+the filter is compiled into a subroutine like this:
+.PP
+.Vb 4
+\& sub filter {
+\&    my ( $set ) = @_;
+\&    $set\->{info} =~ m/product/;
+\& }
+.Ve
 .PP
 The filter text can actually be any Perl regular expression, but of course a
 literal string like 'product' works fine as a regular expression.
 .PP
+What if you want the filter to discard matching rows, rather than showing
+matching rows?  If you're familiar with Perl regular expressions, you might
+guess how to do this.  You have to use a zero-width negative lookahead
+assertion.  If you don't know what that means, don't worry.  Let's filter out
+all rows where the command is Gandalf.  Type the following:
+.PP
+.Vb 2
+\& 1. /
+\& 2. cmd ^(?!Gandalf)
+.Ve
+.PP
 Behind the scenes innotop compiles the quick-filter into a specially tagged
 filter that is otherwise like any other filter.  It just isn't saved to the
 configuration file.
@@ -1314,7 +1407,7 @@ innotop has sensible built-in defaults to sort the most important rows to the
 top of the table.  Like anything else in innotop, you can customize how any
 table is sorted.
 .PP
-To start the sort dialog, start the \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R" with the '^' key, choose a
+To start the sort dialog, start the \*(L"\s-1TABLE EDITOR\*(R"\s0 with the '^' key, choose a
 table if necessary, and press the 's' key.  You'll see a list of columns you can
 use in the sort expression and the current sort expression, if any.  Enter a
 list of columns by which you want to sort and press Enter.  If you want to
@@ -1328,9 +1421,9 @@ sort direction.  Press '?' as usual to see which keys are mapped in any mode.
 .SS "\s-1GROUPING\s0"
 .IX Subsection "GROUPING"
 innotop can group, or aggregate, rows together (the terms are used
-interchangeably).  This is quite similar to an \s-1SQL\s0 \s-1GROUP\s0 \s-1BY\s0 clause.  You can
+interchangeably).  This is quite similar to an \s-1SQL GROUP BY\s0 clause.  You can
 specify to group on certain columns, or if you don't specify any, the entire set
-of rows is treated as one group.  This is quite like \s-1SQL\s0 so far, but unlike \s-1SQL\s0,
+of rows is treated as one group.  This is quite like \s-1SQL\s0 so far, but unlike \s-1SQL,\s0
 you can also select un-grouped columns.  innotop actually aggregates every
 column.  If you don't explicitly specify a grouping function, the default is
 \&'first'.  This is basically a convenience so you don't have to specify an
@@ -1391,8 +1484,8 @@ That's actually quite a worrisome picture.  You've got a lot of idle connections
 (Sleep), and some connections executing queries (Query and Sending Data).
 That's okay, but you also have a lot in Statistics status, collectively spending
 over a minute.  That means the query optimizer is having a really hard time
-optimizing your statements.  Something is wrong; it should normally take
-milliseconds to optimize queries.  You might not have seen this pattern if you
+generating execution plans for your statements.  Something is wrong; it should
+normally take milliseconds to plan queries.  You might not have seen this pattern if you
 didn't look at your connections in aggregate.  (This is a made-up example, but
 it can happen in real life).
 .SS "\s-1PIVOTING\s0"
@@ -1467,7 +1560,7 @@ quoted something.
 .IX Subsection "EXPRESSIONS"
 Expressions are at the core of how innotop works, and are what enables you to
 extend innotop as you wish.  Recall the table lifecycle explained in
-\&\*(L"\s-1TABLES\s0\*(R".  Expressions are used in the earliest step, where it extracts
+\&\*(L"\s-1TABLES\*(R"\s0.  Expressions are used in the earliest step, where it extracts
 values from a data source to form rows.
 .PP
 It does this by calling a subroutine for each column, passing it the source data
@@ -1500,7 +1593,7 @@ subroutine, like this:
 .PP
 Here's a concrete example, taken from the header table \*(L"q_header\*(R" in \*(L"Q:
 Query List\*(R" mode.  This expression calculates the qps, or Queries Per Second,
-column's values, from the values returned by \s-1SHOW\s0 \s-1STATUS:\s0
+column's values, from the values returned by \s-1SHOW STATUS:\s0
 .PP
 .Vb 1
 \& Questions/Uptime_hires
@@ -1532,11 +1625,17 @@ are defined:
 .IP "commify" 4
 .IX Item "commify"
 Adds commas to large numbers every three decimal places.
+.IP "distill" 4
+.IX Item "distill"
+Distills \s-1SQL\s0 into verb-noun-noun format for quick comprehension.
 .IP "dulint_to_int" 4
 .IX Item "dulint_to_int"
 Accepts two unsigned integers and converts them into a single longlong.  This is
 useful for certain operations with InnoDB, which uses two integers as
 transaction identifiers, for example.
+.IP "fuzzy_time" 4
+.IX Item "fuzzy_time"
+Converts a number of seconds into a friendly, readable value like \*(L"1h35m\*(R".
 .IP "no_ctrl_char" 4
 .IX Item "no_ctrl_char"
 Removes quoted control characters from the value.  This is affected by the
@@ -1561,7 +1660,7 @@ Formats numbers with \*(L"num_digits\*(R" number of digits after the decimal poi
 .IX Item "shorten"
 Formats a number as a unit of 1024 (k/M/G/T) and with \*(L"num_digits\*(R" number of
 digits after the decimal point.
-.SS "\s-1TABLE\s0 \s-1EDITOR\s0"
+.SS "\s-1TABLE EDITOR\s0"
 .IX Subsection "TABLE EDITOR"
 The innotop table editor lets you customize tables with keystrokes.  You start
 the table editor with the '^' key.  If there's more than one table on the
@@ -1579,7 +1678,7 @@ show you something like this:
 \& pages_modified     Dirty Pages  Pages modified (dirty  IB_bp_pages_m
 \& buf_pool_hit_rate  Hit Rate     Buffer pool hit rate   IB_bp_buf_poo
 \& total_mem_alloc    Memory       Total memory allocate  IB_bp_total_m
-\& add_pool_alloc     Add\*(Aql Pool   Additional pool alloca  IB_bp_add_poo
+\& add_pool_alloc     Add\*(Aql Pool   Additonal pool alloca  IB_bp_add_poo
 .Ve
 .PP
 The first line shows which table you're editing, and reminds you again to press
@@ -1590,7 +1689,7 @@ editor, color rule editor, and more.
 .PP
 Each row in the display shows a single column in the table you're editing, along
 with a couple of its properties such as its header and source expression (see
-\&\*(L"\s-1EXPRESSIONS\s0\*(R").
+\&\*(L"\s-1EXPRESSIONS\*(R"\s0).
 .PP
 The key mappings are Vim-style, as in many other places.  Pressing 'j' and 'k'
 moves the highlight up or down.  You can then (d)elete or (e)dit the highlighted
@@ -1615,9 +1714,9 @@ the table header.  This can have spaces and funny characters, but be careful not
 to make it too wide and waste space on-screen.
 .IP "\(bu" 4
 The column's data source: this is an expression that determines what data from
-the source (see \*(L"\s-1TABLES\s0\*(R") innotop will put into the column.  This can just be
+the source (see \*(L"\s-1TABLES\*(R"\s0) innotop will put into the column.  This can just be
 the name of an item in the source, or it can be a more complex expression, as
-described in \*(L"\s-1EXPRESSIONS\s0\*(R".
+described in \*(L"\s-1EXPRESSIONS\*(R"\s0.
 .PP
 Once you've entered the required data, your table has a new column.  There is no
 difference between this column and the built-in ones; it can have all the same
@@ -1645,10 +1744,10 @@ what variables you want to monitor.  Behind the scenes they are compiled to a
 list of expressions, and then into a column list so they can be treated just
 like columns in any other table, in terms of data extraction and
 transformations.  However, you're protected from the tedious details by a syntax
-that ought to feel very natural to you: a \s-1SQL\s0 \s-1SELECT\s0 list.
+that ought to feel very natural to you: a \s-1SQL SELECT\s0 list.
 .PP
 The data source for variable sets, and indeed the entire S mode, is the
-combination of \s-1SHOW\s0 \s-1STATUS\s0, \s-1SHOW\s0 \s-1VARIABLES\s0, and \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.  Imagine
+combination of \s-1SHOW STATUS, SHOW VARIABLES,\s0 and \s-1SHOW INNODB STATUS. \s0 Imagine
 that you had a huge table with one column per variable returned from those
 statements.  That's the data source for variable sets.  You can now query this
 data source just like you'd expect.  For example:
@@ -1669,7 +1768,7 @@ start for creating your own.  Press 'e' to edit the current variable set, or
 just to see how it's defined.  To create a new one, just press 'c' and type its
 name.
 .PP
-You may want to use some of the functions listed in \*(L"\s-1TRANSFORMATIONS\s0\*(R" to help
+You may want to use some of the functions listed in \*(L"\s-1TRANSFORMATIONS\*(R"\s0 to help
 format the results.  In particular, \*(L"set_precision\*(R" is often useful to limit
 the number of digits you see.  Extending the above example, here's how:
 .PP
@@ -1694,9 +1793,9 @@ or modify its existing functionality, and add new functionality.  innotop's
 plugin functionality is event-based: plugins register themselves to be called
 when events happen.  They then have a chance to influence the event.
 .PP
-An innotop plugin is a Perl module placed in innotop's \*(L"plugin_dir\*(R"
+An innotop plugin is a Perl module (.pm) file placed in innotop's \*(L"plugin_dir\*(R"
 directory.  On \s-1UNIX\s0 systems, you can place a symbolic link to the module instead
-of putting the actual file there.  innotop automatically discovers the file.  If
+of putting the actual file there.  innotop automatically discovers files named \f(CW\*(C`*.pm\*(C'\fR.  If
 there is a corresponding entry in the \*(L"plugins\*(R" configuration file section,
 innotop loads and activates the plugin.
 .PP
@@ -1708,7 +1807,7 @@ file and determine the package name and description.
 innotop inspects the plugin module's source to determine the Perl package name.
 It looks for a line of the form \*(L"package Foo;\*(R" and if found, considers the
 plugin's package name to be Foo.  Of course the package name can be a valid Perl
-package name, with double semicolons and so on.
+package name such as Foo::Bar, with double colons (::) and so on.
 .PP
 It also looks for a description in the source code, to make the plugin editor
 more human-friendly.  The description is a comment line of the form \*(L"#
@@ -1758,7 +1857,7 @@ for later use.  The variables are defined in the innotop variable
 A hashref of key mappings.  These are innotop's global hot-keys.
 .IP "agg_funcs" 4
 .IX Item "agg_funcs"
-A hashref of functions that can be used for grouping.  See \*(L"\s-1GROUPING\s0\*(R".
+A hashref of functions that can be used for grouping.  See \*(L"\s-1GROUPING\*(R"\s0.
 .IP "config" 4
 .IX Item "config"
 The global configuration hash.
@@ -1772,23 +1871,23 @@ A hashref of innotop's database connections.  These are actual \s-1DBI\s0 connec
 objects.
 .IP "filters" 4
 .IX Item "filters"
-A hashref of filters applied to table rows.  See \*(L"\s-1FILTERS\s0\*(R" for more.
+A hashref of filters applied to table rows.  See \*(L"\s-1FILTERS\*(R"\s0 for more.
 .IP "modes" 4
 .IX Item "modes"
-A hashref of modes.  See \*(L"\s-1MODES\s0\*(R" for more.
+A hashref of modes.  See \*(L"\s-1MODES\*(R"\s0 for more.
 .IP "server_groups" 4
 .IX Item "server_groups"
-A hashref of server groups.  See \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R".
+A hashref of server groups.  See \*(L"\s-1SERVER GROUPS\*(R"\s0.
 .IP "tbl_meta" 4
 .IX Item "tbl_meta"
 A hashref of innotop's table meta-data, with one entry per table (see
-\&\*(L"\s-1TABLES\s0\*(R" for more information).
+\&\*(L"\s-1TABLES\*(R"\s0 for more information).
 .IP "trans_funcs" 4
 .IX Item "trans_funcs"
-A hashref of transformation functions.  See \*(L"\s-1TRANSFORMATIONS\s0\*(R".
+A hashref of transformation functions.  See \*(L"\s-1TRANSFORMATIONS\*(R"\s0.
 .IP "var_sets" 4
 .IX Item "var_sets"
-A hashref of variable sets.  See \*(L"\s-1VARIABLE\s0 \s-1SETS\s0\*(R".
+A hashref of variable sets.  See \*(L"\s-1VARIABLE SETS\*(R"\s0.
 .SS "Plugin Events"
 .IX Subsection "Plugin Events"
 Each event is defined somewhere in the innotop source code.  When innotop runs
@@ -1818,7 +1917,9 @@ This event occurs inside the subroutine that prints the lines to the screen.
 .IX Subsection "Simple Plugin Example"
 The easiest way to explain the plugin functionality is probably with a simple
 example.  The following module adds a column to the beginning of every table and
-sets its value to 1.
+sets its value to 1.  (If you copy and paste this example code, be sure to remove
+the first space from each line; lines such as '# description' must not start with
+whitespace).
 .PP
 .Vb 2
 \& use strict;
@@ -1887,12 +1988,13 @@ inactive.  Exit the editor and restart innotop for the changes to take effect.
 innotop uses a limited set of \s-1SQL\s0 statements to retrieve data from MySQL for
 display.  The statements are customized depending on the server version against
 which they are executed; for example, on MySQL 5 and newer, \s-1INNODB_STATUS\s0
-executes \*(L"\s-1SHOW\s0 \s-1ENGINE\s0 \s-1INNODB\s0 \s-1STATUS\s0\*(R", while on earlier versions it executes
-\&\*(L"\s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0\*(R".  The statements are as follows:
+executes \*(L"\s-1SHOW ENGINE INNODB STATUS\*(R",\s0 while on earlier versions it executes
+\&\*(L"\s-1SHOW INNODB STATUS\*(R". \s0 The statements are as follows:
 .PP
-.Vb 12
+.Vb 10
 \& Statement           SQL executed
 \& =================== ===============================
+\& INDEX_STATISTICS    SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS
 \& INNODB_STATUS       SHOW [ENGINE] INNODB STATUS
 \& KILL_CONNECTION     KILL
 \& KILL_QUERY          KILL QUERY
@@ -1903,13 +2005,14 @@ executes \*(L"\s-1SHOW\s0 \s-1ENGINE\s0 \s-1INNODB\s0 \s-1STATUS\s0\*(R", while
 \& SHOW_SLAVE_STATUS   SHOW SLAVE STATUS
 \& SHOW_STATUS         SHOW [GLOBAL] STATUS
 \& SHOW_VARIABLES      SHOW [GLOBAL] VARIABLES
+\& TABLE_STATISTICS    SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS
 .Ve
 .SH "DATA SOURCES"
 .IX Header "DATA SOURCES"
-Each time innotop extracts values to create a table (see \*(L"\s-1EXPRESSIONS\s0\*(R" and
-\&\*(L"\s-1TABLES\s0\*(R"), it does so from a particular data source.  Largely because of the
-complex data extracted from \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0, this is slightly messy.  \s-1SHOW\s0
-\&\s-1INNODB\s0 \s-1STATUS\s0 contains a mixture of single values and repeated values that form
+Each time innotop extracts values to create a table (see \*(L"\s-1EXPRESSIONS\*(R"\s0 and
+\&\*(L"\s-1TABLES\*(R"\s0), it does so from a particular data source.  Largely because of the
+complex data extracted from \s-1SHOW INNODB STATUS,\s0 this is slightly messy.  \s-1SHOW
+INNODB STATUS\s0 contains a mixture of single values and repeated values that form
 nested data sets.
 .PP
 Whenever innotop fetches data from MySQL, it adds two extra bits to each set:
@@ -1921,41 +2024,53 @@ Here are the kinds of data sources from which data is extracted:
 .IP "\s-1STATUS_VARIABLES\s0" 4
 .IX Item "STATUS_VARIABLES"
 This is the broadest category, into which the most kinds of data fall.  It
-begins with the combination of \s-1SHOW\s0 \s-1STATUS\s0 and \s-1SHOW\s0 \s-1VARIABLES\s0, but other sources
-may be included as needed, for example, \s-1SHOW\s0 \s-1MASTER\s0 \s-1STATUS\s0 and \s-1SHOW\s0 \s-1SLAVE\s0
-\&\s-1STATUS\s0, as well as many of the non-repeated values from \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.
+begins with the combination of \s-1SHOW STATUS\s0 and \s-1SHOW VARIABLES,\s0 but other sources
+may be included as needed, for example, \s-1SHOW MASTER STATUS\s0 and \s-1SHOW SLAVE
+STATUS,\s0 as well as many of the non-repeated values from \s-1SHOW INNODB STATUS.\s0
 .IP "\s-1DEADLOCK_LOCKS\s0" 4
 .IX Item "DEADLOCK_LOCKS"
-This data is extracted from the transaction list in the \s-1LATEST\s0 \s-1DETECTED\s0 \s-1DEADLOCK\s0
-section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.  It is nested two levels deep: transactions, then
+This data is extracted from the transaction list in the \s-1LATEST DETECTED DEADLOCK\s0
+section of \s-1SHOW INNODB STATUS. \s0 It is nested two levels deep: transactions, then
 locks.
 .IP "\s-1DEADLOCK_TRANSACTIONS\s0" 4
 .IX Item "DEADLOCK_TRANSACTIONS"
-This data is from the transaction list in the \s-1LATEST\s0 \s-1DETECTED\s0 \s-1DEADLOCK\s0
-section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.  It is nested one level deep.
+This data is from the transaction list in the \s-1LATEST DETECTED DEADLOCK\s0
+section of \s-1SHOW INNODB STATUS. \s0 It is nested one level deep.
 .IP "\s-1EXPLAIN\s0" 4
 .IX Item "EXPLAIN"
-This data is from the result set returned by \s-1EXPLAIN\s0.
+This data is from the result set returned by \s-1EXPLAIN.\s0
+.IP "\s-1INNODB_BLOCKED_BLOCKER\s0" 4
+.IX Item "INNODB_BLOCKED_BLOCKER"
+This data is from the \s-1INFORMATION_SCHEMA\s0 tables related to InnoDB locks and
+the processlist.
 .IP "\s-1INNODB_TRANSACTIONS\s0" 4
 .IX Item "INNODB_TRANSACTIONS"
-This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0.
+This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS.\s0
 .IP "\s-1IO_THREADS\s0" 4
 .IX Item "IO_THREADS"
-This data is from the list of threads in the the \s-1FILE\s0 I/O section of \s-1SHOW\s0 \s-1INNODB\s0
-\&\s-1STATUS\s0.
+This data is from the list of threads in the the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
+STATUS.\s0
 .IP "\s-1INNODB_LOCKS\s0" 4
 .IX Item "INNODB_LOCKS"
-This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 and is nested
+This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS\s0 and is nested
 two levels deep.
+.IP "\s-1MASTER_SLAVE\s0" 4
+.IX Item "MASTER_SLAVE"
+This data is from the combination of \s-1SHOW MASTER STATUS\s0 and \s-1SHOW SLAVE STATUS.\s0
 .IP "\s-1OPEN_TABLES\s0" 4
 .IX Item "OPEN_TABLES"
-This data is from \s-1SHOW\s0 \s-1OPEN\s0 \s-1TABLES\s0.
+This data is from \s-1SHOW OPEN TABLES.\s0
 .IP "\s-1PROCESSLIST\s0" 4
 .IX Item "PROCESSLIST"
-This data is from \s-1SHOW\s0 \s-1FULL\s0 \s-1PROCESSLIST\s0.
+This data is from \s-1SHOW FULL PROCESSLIST.\s0
+.IP "\s-1PROCESSLIST_STATS\s0" 4
+.IX Item "PROCESSLIST_STATS"
+This data is from \s-1SHOW FULL PROCESSLIST\s0 and computes stats such as the maximum time
+a user query has been running, and how many user queries are running. A \*(L"user
+query\*(R" excludes replication threads.
 .IP "\s-1OS_WAIT_ARRAY\s0" 4
 .IX Item "OS_WAIT_ARRAY"
-This data is from the \s-1SEMAPHORES\s0 section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 and is nested one
+This data is from the \s-1SEMAPHORES\s0 section of \s-1SHOW INNODB STATUS\s0 and is nested one
 level deep.  It comes from the lines that look like this:
 .Sp
 .Vb 1
@@ -1976,15 +2091,15 @@ mode.
 You need special privileges to start and stop slave servers.
 .IP "\(bu" 4
 You need appropriate privileges to create and drop the deadlock tables if needed
-(see \*(L"\s-1SERVER\s0 \s-1CONNECTIONS\s0\*(R").
+(see \*(L"\s-1SERVER CONNECTIONS\*(R"\s0).
 .SH "SYSTEM REQUIREMENTS"
 .IX Header "SYSTEM REQUIREMENTS"
-You need Perl to run innotop, of course.  You also need a few Perl modules: \s-1DBI\s0,
+You need Perl to run innotop, of course.  You also need a few Perl modules: \s-1DBI,\s0
 DBD::mysql,  Term::ReadKey, and Time::HiRes.  These should be included with most
 Perl distributions, but in case they are not, I recommend using versions
-distributed with your operating system or Perl distribution, not from \s-1CPAN\s0.
+distributed with your operating system or Perl distribution, not from \s-1CPAN.\s0
 Term::ReadKey in particular has been known to cause problems if installed from
-\&\s-1CPAN\s0.
+\&\s-1CPAN.\s0
 .PP
 If you have Term::ANSIColor, innotop will use it to format headers more readably
 and compactly.  (Under Microsoft Windows, you also need Win32::Console::ANSI for
@@ -1992,7 +2107,7 @@ terminal formatting codes to be honored).  If you install Term::ReadLine,
 preferably Term::ReadLine::Gnu, you'll get nice auto-completion support.
 .PP
 I run innotop on Gentoo GNU/Linux, Debian and Ubuntu, and I've had feedback from
-people successfully running it on Red Hat, CentOS, Solaris, and Mac \s-1OSX\s0.  I
+people successfully running it on Red Hat, CentOS, Solaris, and Mac \s-1OSX.  I\s0
 don't see any reason why it won't work on other UNIX-ish operating systems, but
 I don't know for sure.  It also runs on Windows under ActivePerl without
 problem.
@@ -2017,6 +2132,7 @@ displays it.
 The following people and organizations are acknowledged for various reasons.
 Hopefully no one has been forgotten.
 .PP
+Aaron Racine,
 Allen K. Smith,
 Aurimas Mikalauskas,
 Bartosz Fenski,
@@ -2038,7 +2154,7 @@ Kristian Kohntopp,
 Lenz Grimmer,
 Maciej Dobrzanski,
 Michiel Betel,
-MySQL \s-1AB\s0,
+MySQL \s-1AB,\s0
 Paul McCullagh,
 Sebastien Estienne,
 Sourceforge.net,
@@ -2056,9 +2172,9 @@ not be able to compile it then).
 This program is copyright (c) 2006 Baron Schwartz.
 Feedback and improvements are welcome.
 .PP
-\&\s-1THIS\s0 \s-1PROGRAM\s0 \s-1IS\s0 \s-1PROVIDED\s0 \*(L"\s-1AS\s0 \s-1IS\s0\*(R" \s-1AND\s0 \s-1WITHOUT\s0 \s-1ANY\s0 \s-1EXPRESS\s0 \s-1OR\s0 \s-1IMPLIED\s0
-\&\s-1WARRANTIES\s0, \s-1INCLUDING\s0, \s-1WITHOUT\s0 \s-1LIMITATION\s0, \s-1THE\s0 \s-1IMPLIED\s0 \s-1WARRANTIES\s0 \s-1OF\s0
-\&\s-1MERCHANTIBILITY\s0 \s-1AND\s0 \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0.
+\&\s-1THIS PROGRAM IS PROVIDED \*(L"AS IS\*(R" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.\s0
 .PP
 This program is free software; you can redistribute it and/or modify it under
 the terms of the \s-1GNU\s0 General Public License as published by the Free Software
@@ -2068,7 +2184,7 @@ licenses.
 .PP
 You should have received a copy of the \s-1GNU\s0 General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, \s-1MA\s0  02111\-1307  \s-1USA\s0.
+Place, Suite 330, Boston, \s-1MA  02111\-1307  USA.\s0
 .PP
 Execute innotop and press '!' to see this information at any time.
 .SH "AUTHOR"
@@ -2077,7 +2193,7 @@ Originally written by Baron Schwartz; currently maintained by Aaron Racine.
 .SH "BUGS"
 .IX Header "BUGS"
 You can report bugs, ask for improvements, and get other help and support at
-<http://code.google.com/p/innotop/>.  There are mailing lists, a source code
+<https://github.com/innotop/innotop>.  There are mailing lists, a source code
 browser, a bug tracker, etc.  Please use these instead of contacting the
 maintainer or author directly, as it makes our job easier and benefits others if the
 discussions are permanent and public.  Of course, if you need to contact us in