Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1008796-add-database-to-several-tools into lp:percona-toolkit/2.2

Proposed by Brian Fraser
Status: Merged
Merged at revision: 553
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-1008796-add-database-to-several-tools
Merge into: lp:percona-toolkit/2.2
Diff against target: 152 lines (+54/-0)
9 files modified
bin/pt-archiver (+6/-0)
bin/pt-config-diff (+6/-0)
bin/pt-deadlock-logger (+6/-0)
bin/pt-find (+6/-0)
bin/pt-fk-error-logger (+6/-0)
bin/pt-online-schema-change (+6/-0)
bin/pt-query-digest (+6/-0)
bin/pt-upgrade (+6/-0)
bin/pt-variable-advisor (+6/-0)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-1008796-add-database-to-several-tools
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Brian Fraser Pending
Review via email: mp+151765@code.launchpad.net
To post a comment you must log in.
547. By Daniel Nichter

Merge pt-osc-retry-timeouts.

Revision history for this message
Daniel Nichter (daniel-nichter) wrote :

I think this should be harmless enough, and tests still pass.

review: Approve
548. By Brian Fraser

Merged fix-1008796-add-database-to-several-tools

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-archiver'
2--- bin/pt-archiver 2013-03-04 17:28:43 +0000
3+++ bin/pt-archiver 2013-03-08 13:08:23 +0000
4@@ -6826,6 +6826,12 @@
5 Read this comma-separated list of config files; if specified, this must be the
6 first option on the command line.
7
8+=item --database
9+
10+short form: -D; type: string
11+
12+Connect to this database.
13+
14 =item --delayed-insert
15
16 Add the DELAYED modifier to INSERT statements.
17
18=== modified file 'bin/pt-config-diff'
19--- bin/pt-config-diff 2013-03-04 17:28:43 +0000
20+++ bin/pt-config-diff 2013-03-08 13:08:23 +0000
21@@ -5348,6 +5348,12 @@
22 first option on the command line. (This option does not specify a CONFIG;
23 it's equivalent to C<--defaults-file>.)
24
25+=item --database
26+
27+short form: -D; type: string
28+
29+Connect to this database.
30+
31 =item --defaults-file
32
33 short form: -F; type: string
34
35=== modified file 'bin/pt-deadlock-logger'
36--- bin/pt-deadlock-logger 2013-03-04 17:28:43 +0000
37+++ bin/pt-deadlock-logger 2013-03-08 13:08:23 +0000
38@@ -5077,6 +5077,12 @@
39 causes pt-deadlock-logger to create the table automatically using the suggested
40 table structure.
41
42+=item --database
43+
44+short form: -D; type: string
45+
46+Connect to this database.
47+
48 =item --daemonize
49
50 Fork to the background and detach from the shell. POSIX operating systems only.
51
52=== modified file 'bin/pt-find'
53--- bin/pt-find 2013-03-04 17:28:43 +0000
54+++ bin/pt-find 2013-03-08 13:08:23 +0000
55@@ -4285,6 +4285,12 @@
56 Read this comma-separated list of config files; if specified, this must be the
57 first option on the command line.
58
59+=item --database
60+
61+short form: -D; type: string
62+
63+Connect to this database.
64+
65 =item --day-start
66
67 Measure times (for L<"--mmin">, etc) from the beginning of today rather than
68
69=== modified file 'bin/pt-fk-error-logger'
70--- bin/pt-fk-error-logger 2013-03-04 17:28:43 +0000
71+++ bin/pt-fk-error-logger 2013-03-08 13:08:23 +0000
72@@ -4114,6 +4114,12 @@
73 Read this comma-separated list of config files; if specified, this must be the
74 first option on the command line.
75
76+=item --database
77+
78+short form: -D; type: string
79+
80+Connect to this database.
81+
82 =item --daemonize
83
84 Fork to the background and detach from the shell. POSIX operating systems only.
85
86=== modified file 'bin/pt-online-schema-change'
87--- bin/pt-online-schema-change 2013-03-05 23:33:38 +0000
88+++ bin/pt-online-schema-change 2013-03-08 13:08:23 +0000
89@@ -10669,6 +10669,12 @@
90 50 seems likely to be unacceptably high for most servers, indicating that the
91 operation should be canceled immediately.
92
93+=item --database
94+
95+short form: -D; type: string
96+
97+Connect to this database.
98+
99 =item --default-engine
100
101 Remove C<ENGINE> from the new table.
102
103=== modified file 'bin/pt-query-digest'
104--- bin/pt-query-digest 2013-03-04 17:28:43 +0000
105+++ bin/pt-query-digest 2013-03-08 13:08:23 +0000
106@@ -14694,6 +14694,12 @@
107 L<"--history-table"> to be created with the default structures shown
108 in the documentation for L<"--review">.
109
110+=item --database
111+
112+short form: -D; type: string
113+
114+Connect to this database.
115+
116 =item --daemonize
117
118 Fork to the background and detach from the shell. POSIX
119
120=== modified file 'bin/pt-upgrade'
121--- bin/pt-upgrade 2013-03-04 17:28:43 +0000
122+++ bin/pt-upgrade 2013-03-08 13:08:23 +0000
123@@ -13429,6 +13429,12 @@
124 For example, C<DELETE col FROM tbl WHERE id=1> is converted to
125 C<SELECT col FROM tbl WHERE id=1>.
126
127+=item --database
128+
129+short form: -D; type: string
130+
131+Connect to this database.
132+
133 =item --daemonize
134
135 Fork to the background and detach from the shell. POSIX
136
137=== modified file 'bin/pt-variable-advisor'
138--- bin/pt-variable-advisor 2013-03-04 17:28:43 +0000
139+++ bin/pt-variable-advisor 2013-03-08 13:08:23 +0000
140@@ -5790,6 +5790,12 @@
141 binmode on STDOUT without the utf8 layer, and runs SET NAMES after
142 connecting to MySQL.
143
144+=item --database
145+
146+short form: -D; type: string
147+
148+Connect to this database.
149+
150 =item --config
151
152 type: Array

Subscribers

People subscribed via source and target branches