Merge lp:~percona-toolkit-dev/percona-toolkit/doc-spelling-fixes-2.1-bug-896553 into lp:percona-toolkit/2.1

Proposed by Daniel Nichter
Status: Merged
Approved by: Daniel Nichter
Approved revision: 218
Merged at revision: 218
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/doc-spelling-fixes-2.1-bug-896553
Merge into: lp:percona-toolkit/2.1
Diff against target: 108 lines (+9/-9)
7 files modified
bin/pt-online-schema-change (+1/-1)
bin/pt-query-advisor (+1/-1)
bin/pt-sift (+1/-1)
bin/pt-tcp-model (+1/-1)
bin/pt-upgrade (+2/-2)
bin/pt-visual-explain (+1/-1)
docs/percona-toolkit.pod (+2/-2)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/doc-spelling-fixes-2.1-bug-896553
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+99451@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change 2012-03-07 23:41:54 +0000
+++ bin/pt-online-schema-change 2012-03-26 23:56:26 +0000
@@ -4871,7 +4871,7 @@
4871specified.4871specified.
48724872
4873The default behavior, when this option is not specified and4873The default behavior, when this option is not specified and
4874C<--[no]create-tmp-tble> is true, is to create a temporary table named4874C<--[no]create-tmp-table> is true, is to create a temporary table named
4875C<__tmp_TABLE> where C<TABLE> is the original table specified by the DSN4875C<__tmp_TABLE> where C<TABLE> is the original table specified by the DSN
4876on the command line.4876on the command line.
48774877
48784878
=== modified file 'bin/pt-query-advisor'
--- bin/pt-query-advisor 2012-03-07 23:41:54 +0000
+++ bin/pt-query-advisor 2012-03-26 23:56:26 +0000
@@ -6677,7 +6677,7 @@
66776677
6678 pt-query-advisor /path/to/slow-query.log6678 pt-query-advisor /path/to/slow-query.log
66796679
6680Analyze all queires in a general log:6680Analyze all queries in a general log:
66816681
6682 pt-query-advisor --type genlog mysql.log6682 pt-query-advisor --type genlog mysql.log
66836683
66846684
=== modified file 'bin/pt-sift'
--- bin/pt-sift 2012-03-07 23:41:54 +0000
+++ bin/pt-sift 2012-03-26 23:56:26 +0000
@@ -632,7 +632,7 @@
632632
633=item *633=item *
634634
635Sets the action to view all of the samples's files in the less program.635Sets the action to view all of the sample's files in the less program.
636636
637=back637=back
638638
639639
=== modified file 'bin/pt-tcp-model'
--- bin/pt-tcp-model 2012-03-07 23:41:54 +0000
+++ bin/pt-tcp-model 2012-03-26 23:56:26 +0000
@@ -2253,7 +2253,7 @@
2253response time (elapsed time) are computed. Recall that there may be multiple2253response time (elapsed time) are computed. Recall that there may be multiple
2254inbound and outbound packets per request and response, and refer to the2254inbound and outbound packets per request and response, and refer to the
2255following ASCII diagram. Suppose that a client sends a series of three inbound2255following ASCII diagram. Suppose that a client sends a series of three inbound
2256(I) packets to the server, whch computes the result and then sends two outbound2256(I) packets to the server, which computes the result and then sends two outbound
2257(O) packets back:2257(O) packets back:
22582258
2259 I I I ..................... O O2259 I I I ..................... O O
22602260
=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade 2012-03-07 23:41:54 +0000
+++ bin/pt-upgrade 2012-03-26 23:56:26 +0000
@@ -11332,7 +11332,7 @@
11332=head1 DESCRIPTION11332=head1 DESCRIPTION
1133311333
11334pt-upgrade executes queries from slowlogs on one or more MySQL server to find11334pt-upgrade executes queries from slowlogs on one or more MySQL server to find
11335differences in query time, warnings, results, and other aspects of the querys'11335differences in query time, warnings, results, and other aspects of the queries'
11336execution. This helps evaluate upgrades, migrations and configuration11336execution. This helps evaluate upgrades, migrations and configuration
11337changes. The comparisons specified by L<"--compare"> determine what11337changes. The comparisons specified by L<"--compare"> determine what
11338differences can be found. A report is printed which outlines all the11338differences can be found. A report is printed which outlines all the
@@ -11494,7 +11494,7 @@
11494Convert non-SELECT statements to SELECTs and compare.11494Convert non-SELECT statements to SELECTs and compare.
1149511495
11496By default non-SELECT statements are not allowed. This option causes11496By default non-SELECT statements are not allowed. This option causes
11497non-SELECT statments (like UPDATE, INSERT and DELETE) to be converted11497non-SELECT statements (like UPDATE, INSERT and DELETE) to be converted
11498to SELECT statements, executed and compared.11498to SELECT statements, executed and compared.
1149911499
11500For example, C<DELETE col FROM tbl WHERE id=1> is converted to11500For example, C<DELETE col FROM tbl WHERE id=1> is converted to
1150111501
=== modified file 'bin/pt-visual-explain'
--- bin/pt-visual-explain 2012-03-07 23:41:54 +0000
+++ bin/pt-visual-explain 2012-03-26 23:56:26 +0000
@@ -2564,7 +2564,7 @@
25642, 4 is a subquery of 3. As it is, this means 4 is a subquery of the nearest25642, 4 is a subquery of 3. As it is, this means 4 is a subquery of the nearest
2565previous recent row with a smaller id, which is 1. Likewise for 3 and 2.2565previous recent row with a smaller id, which is 1. Likewise for 3 and 2.
25662566
2567This structure is hard to programatically build into a tree for the same reason2567This structure is hard to programmatically build into a tree for the same reason
2568it's hard to understand by inspection: there are both forward and backward2568it's hard to understand by inspection: there are both forward and backward
2569references. <derivedN> is a forward reference to selectN, while <unionM,N> is a2569references. <derivedN> is a forward reference to selectN, while <unionM,N> is a
2570backward reference to selectM and selectN. That makes recursion and other2570backward reference to selectM and selectN. That makes recursion and other
25712571
=== modified file 'docs/percona-toolkit.pod'
--- docs/percona-toolkit.pod 2012-03-07 23:41:54 +0000
+++ docs/percona-toolkit.pod 2012-03-26 23:56:26 +0000
@@ -464,7 +464,7 @@
464=head1 AUTHORS464=head1 AUTHORS
465465
466Percona Toolkit is primarily developed by Baron Schwartz and Daniel Nichter,466Percona Toolkit is primarily developed by Baron Schwartz and Daniel Nichter,
467both of whom are employed by Percona Inc. See each program's documenation467both of whom are employed by Percona Inc. See each program's documentation
468for details.468for details.
469469
470=head1 COPYRIGHT, LICENSE, AND WARRANTY470=head1 COPYRIGHT, LICENSE, AND WARRANTY
@@ -474,7 +474,7 @@
474474
475THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED475THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
476WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF476WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
477MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.477MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
478478
479This program is free software; you can redistribute it and/or modify it under479This program is free software; you can redistribute it and/or modify it under
480the terms of the GNU General Public License as published by the Free Software480the terms of the GNU General Public License as published by the Free Software

Subscribers

People subscribed via source and target branches