Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/turn-off-v-c into lp:percona-toolkit/2.1

  1. turn-off-v-c
  2. Merge into 2.1
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 386
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/turn-off-v-c
Merge into: lp:percona-toolkit/2.1
Diff against target: 646 lines (+34/-156)
22 files modified
bin/pt-archiver (+1/-7)
bin/pt-config-diff (+1/-7)
bin/pt-deadlock-logger (+1/-7)
bin/pt-diskstats (+1/-7)
bin/pt-duplicate-key-checker (+1/-7)
bin/pt-find (+1/-7)
bin/pt-fk-error-logger (+1/-7)
bin/pt-heartbeat (+1/-7)
bin/pt-index-usage (+1/-7)
bin/pt-kill (+1/-7)
bin/pt-online-schema-change (+1/-7)
bin/pt-query-advisor (+1/-7)
bin/pt-query-digest (+1/-7)
bin/pt-slave-delay (+1/-7)
bin/pt-slave-restart (+1/-7)
bin/pt-table-checksum (+1/-7)
bin/pt-table-sync (+1/-7)
bin/pt-upgrade (+1/-7)
bin/pt-variable-advisor (+1/-7)
lib/PerconaTest.pm (+0/-4)
t/pt-archiver/version_check.t (+8/-10)
t/pt-query-digest/version_check.t (+7/-9)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/turn-off-v-c
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+121940@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
1=== modified file 'bin/pt-archiver'
2--- bin/pt-archiver 2012-08-28 22:56:46 +0000
3+++ bin/pt-archiver 2012-08-29 20:29:19 +0000
4@@ -6825,9 +6825,7 @@
5
6 Show version and exit.
7
8-=item --[no]version-check
9-
10-default: yes
11+=item --version-check
12
13 Send program versions to Percona and print suggested upgrades and problems.
14
15@@ -6837,10 +6835,6 @@
16 used versions of programs, and to suggest to customers possible upgrades
17 and known bad versions of programs.
18
19-This feature can be disabled by specifying C<--no-version-check> on the
20-command line or in one of several L<"--config"> files, or by setting the
21-environment variable C<PERCONA_VERSION_CHECK=0>.
22-
23 For more information, visit L<http://www.percona.com/version-check>.
24
25 =item --where
26
27=== modified file 'bin/pt-config-diff'
28--- bin/pt-config-diff 2012-08-28 14:58:54 +0000
29+++ bin/pt-config-diff 2012-08-29 20:29:19 +0000
30@@ -4361,9 +4361,7 @@
31
32 Show version and exit.
33
34-=item --[no]version-check
35-
36-default: yes
37+=item --version-check
38
39 Send program versions to Percona and print suggested upgrades and problems.
40
41@@ -4373,10 +4371,6 @@
42 used versions of programs, and to suggest to customers possible upgrades
43 and known bad versions of programs.
44
45-This feature can be disabled by specifying C<--no-version-check> on the
46-command line or in one of several L<"--config"> files, or by setting the
47-environment variable C<PERCONA_VERSION_CHECK=0>.
48-
49 For more information, visit L<http://www.percona.com/version-check>.
50
51 =back
52
53=== modified file 'bin/pt-deadlock-logger'
54--- bin/pt-deadlock-logger 2012-08-28 22:56:46 +0000
55+++ bin/pt-deadlock-logger 2012-08-29 20:29:19 +0000
56@@ -4289,9 +4289,7 @@
57
58 Show version and exit.
59
60-=item --[no]version-check
61-
62-default: yes
63+=item --version-check
64
65 Send program versions to Percona and print suggested upgrades and problems.
66
67@@ -4301,10 +4299,6 @@
68 used versions of programs, and to suggest to customers possible upgrades
69 and known bad versions of programs.
70
71-This feature can be disabled by specifying C<--no-version-check> on the
72-command line or in one of several L<"--config"> files, or by setting the
73-environment variable C<PERCONA_VERSION_CHECK=0>.
74-
75 For more information, visit L<http://www.percona.com/version-check>.
76
77 =back
78
79=== modified file 'bin/pt-diskstats'
80--- bin/pt-diskstats 2012-08-28 22:56:46 +0000
81+++ bin/pt-diskstats 2012-08-29 20:29:19 +0000
82@@ -5170,9 +5170,7 @@
83
84 Show version and exit.
85
86-=item --[no]version-check
87-
88-default: yes
89+=item --version-check
90
91 Send program versions to Percona and print suggested upgrades and problems.
92
93@@ -5182,10 +5180,6 @@
94 used versions of programs, and to suggest to customers possible upgrades
95 and known bad versions of programs.
96
97-This feature can be disabled by specifying C<--no-version-check> on the
98-command line or in one of several L<"--config"> files, or by setting the
99-environment variable C<PERCONA_VERSION_CHECK=0>.
100-
101 For more information, visit L<http://www.percona.com/version-check>.
102
103 =back
104
105=== modified file 'bin/pt-duplicate-key-checker'
106--- bin/pt-duplicate-key-checker 2012-08-28 22:56:46 +0000
107+++ bin/pt-duplicate-key-checker 2012-08-29 20:29:19 +0000
108@@ -4955,9 +4955,7 @@
109
110 Show version and exit.
111
112-=item --[no]version-check
113-
114-default: yes
115+=item --version-check
116
117 Send program versions to Percona and print suggested upgrades and problems.
118
119@@ -4967,10 +4965,6 @@
120 used versions of programs, and to suggest to customers possible upgrades
121 and known bad versions of programs.
122
123-This feature can be disabled by specifying C<--no-version-check> on the
124-command line or in one of several L<"--config"> files, or by setting the
125-environment variable C<PERCONA_VERSION_CHECK=0>.
126-
127 For more information, visit L<http://www.percona.com/version-check>.
128
129 =back
130
131=== modified file 'bin/pt-find'
132--- bin/pt-find 2012-08-28 22:56:46 +0000
133+++ bin/pt-find 2012-08-29 20:29:19 +0000
134@@ -4073,9 +4073,7 @@
135
136 Show version and exit.
137
138-=item --[no]version-check
139-
140-default: yes
141+=item --version-check
142
143 Send program versions to Percona and print suggested upgrades and problems.
144
145@@ -4085,10 +4083,6 @@
146 used versions of programs, and to suggest to customers possible upgrades
147 and known bad versions of programs.
148
149-This feature can be disabled by specifying C<--no-version-check> on the
150-command line or in one of several L<"--config"> files, or by setting the
151-environment variable C<PERCONA_VERSION_CHECK=0>.
152-
153 For more information, visit L<http://www.percona.com/version-check>.
154
155 =back
156
157=== modified file 'bin/pt-fk-error-logger'
158--- bin/pt-fk-error-logger 2012-08-28 22:56:46 +0000
159+++ bin/pt-fk-error-logger 2012-08-29 20:29:19 +0000
160@@ -3536,9 +3536,7 @@
161
162 Show version and exit.
163
164-=item --[no]version-check
165-
166-default: yes
167+=item --version-check
168
169 Send program versions to Percona and print suggested upgrades and problems.
170
171@@ -3548,10 +3546,6 @@
172 used versions of programs, and to suggest to customers possible upgrades
173 and known bad versions of programs.
174
175-This feature can be disabled by specifying C<--no-version-check> on the
176-command line or in one of several L<"--config"> files, or by setting the
177-environment variable C<PERCONA_VERSION_CHECK=0>.
178-
179 For more information, visit L<http://www.percona.com/version-check>.
180
181 =back
182
183=== modified file 'bin/pt-heartbeat'
184--- bin/pt-heartbeat 2012-08-28 22:56:46 +0000
185+++ bin/pt-heartbeat 2012-08-29 20:29:19 +0000
186@@ -5472,9 +5472,7 @@
187
188 Show version and exit.
189
190-=item --[no]version-check
191-
192-default: yes
193+=item --version-check
194
195 Send program versions to Percona and print suggested upgrades and problems.
196
197@@ -5484,10 +5482,6 @@
198 used versions of programs, and to suggest to customers possible upgrades
199 and known bad versions of programs.
200
201-This feature can be disabled by specifying C<--no-version-check> on the
202-command line or in one of several L<"--config"> files, or by setting the
203-environment variable C<PERCONA_VERSION_CHECK=0>.
204-
205 For more information, visit L<http://www.percona.com/version-check>.
206
207 =back
208
209=== modified file 'bin/pt-index-usage'
210--- bin/pt-index-usage 2012-08-28 22:56:46 +0000
211+++ bin/pt-index-usage 2012-08-29 20:29:19 +0000
212@@ -7000,9 +7000,7 @@
213
214 Show version and exit.
215
216-=item --[no]version-check
217-
218-default: yes
219+=item --version-check
220
221 Send program versions to Percona and print suggested upgrades and problems.
222
223@@ -7012,10 +7010,6 @@
224 used versions of programs, and to suggest to customers possible upgrades
225 and known bad versions of programs.
226
227-This feature can be disabled by specifying C<--no-version-check> on the
228-command line or in one of several L<"--config"> files, or by setting the
229-environment variable C<PERCONA_VERSION_CHECK=0>.
230-
231 For more information, visit L<http://www.percona.com/version-check>.
232
233 =back
234
235=== modified file 'bin/pt-kill'
236--- bin/pt-kill 2012-08-28 22:56:46 +0000
237+++ bin/pt-kill 2012-08-29 20:29:19 +0000
238@@ -6961,9 +6961,7 @@
239
240 Show version and exit.
241
242-=item --[no]version-check
243-
244-default: yes
245+=item --version-check
246
247 Send program versions to Percona and print suggested upgrades and problems.
248
249@@ -6973,10 +6971,6 @@
250 used versions of programs, and to suggest to customers possible upgrades
251 and known bad versions of programs.
252
253-This feature can be disabled by specifying C<--no-version-check> on the
254-command line or in one of several L<"--config"> files, or by setting the
255-environment variable C<PERCONA_VERSION_CHECK=0>.
256-
257 For more information, visit L<http://www.percona.com/version-check>.
258
259 =item --victims
260
261=== modified file 'bin/pt-online-schema-change'
262--- bin/pt-online-schema-change 2012-08-28 22:56:46 +0000
263+++ bin/pt-online-schema-change 2012-08-29 20:29:19 +0000
264@@ -9605,9 +9605,7 @@
265
266 Show version and exit.
267
268-=item --[no]version-check
269-
270-default: yes
271+=item --version-check
272
273 Send program versions to Percona and print suggested upgrades and problems.
274
275@@ -9617,10 +9615,6 @@
276 used versions of programs, and to suggest to customers possible upgrades
277 and known bad versions of programs.
278
279-This feature can be disabled by specifying C<--no-version-check> on the
280-command line or in one of several L<"--config"> files, or by setting the
281-environment variable C<PERCONA_VERSION_CHECK=0>.
282-
283 For more information, visit L<http://www.percona.com/version-check>.
284
285 =back
286
287=== modified file 'bin/pt-query-advisor'
288--- bin/pt-query-advisor 2012-08-28 22:56:46 +0000
289+++ bin/pt-query-advisor 2012-08-29 20:29:19 +0000
290@@ -8234,9 +8234,7 @@
291
292 Show version and exit.
293
294-=item --[no]version-check
295-
296-default: yes
297+=item --version-check
298
299 Send program versions to Percona and print suggested upgrades and problems.
300
301@@ -8246,10 +8244,6 @@
302 used versions of programs, and to suggest to customers possible upgrades
303 and known bad versions of programs.
304
305-This feature can be disabled by specifying C<--no-version-check> on the
306-command line or in one of several L<"--config"> files, or by setting the
307-environment variable C<PERCONA_VERSION_CHECK=0>.
308-
309 For more information, visit L<http://www.percona.com/version-check>.
310
311 =item --where
312
313=== modified file 'bin/pt-query-digest'
314--- bin/pt-query-digest 2012-08-28 22:56:46 +0000
315+++ bin/pt-query-digest 2012-08-29 20:29:19 +0000
316@@ -16648,9 +16648,7 @@
317
318 Show version and exit.
319
320-=item --[no]version-check
321-
322-default: yes
323+=item --version-check
324
325 Send program versions to Percona and print suggested upgrades and problems.
326
327@@ -16660,10 +16658,6 @@
328 used versions of programs, and to suggest to customers possible upgrades
329 and known bad versions of programs.
330
331-This feature can be disabled by specifying C<--no-version-check> on the
332-command line or in one of several L<"--config"> files, or by setting the
333-environment variable C<PERCONA_VERSION_CHECK=0>.
334-
335 For more information, visit L<http://www.percona.com/version-check>.
336
337 =item --watch-server
338
339=== modified file 'bin/pt-slave-delay'
340--- bin/pt-slave-delay 2012-08-28 01:30:48 +0000
341+++ bin/pt-slave-delay 2012-08-29 20:29:19 +0000
342@@ -4119,9 +4119,7 @@
343
344 Show version and exit.
345
346-=item --[no]version-check
347-
348-default: yes
349+=item --version-check
350
351 Send program versions to Percona and print suggested upgrades and problems.
352
353@@ -4131,10 +4129,6 @@
354 used versions of programs, and to suggest to customers possible upgrades
355 and known bad versions of programs.
356
357-This feature can be disabled by specifying C<--no-version-check> on the
358-command line or in one of several L<"--config"> files, or by setting the
359-environment variable C<PERCONA_VERSION_CHECK=0>.
360-
361 For more information, visit L<http://www.percona.com/version-check>.
362
363 =back
364
365=== modified file 'bin/pt-slave-restart'
366--- bin/pt-slave-restart 2012-08-28 22:56:46 +0000
367+++ bin/pt-slave-restart 2012-08-29 20:29:19 +0000
368@@ -5038,9 +5038,7 @@
369
370 Show version and exit.
371
372-=item --[no]version-check
373-
374-default: yes
375+=item --version-check
376
377 Send program versions to Percona and print suggested upgrades and problems.
378
379@@ -5050,10 +5048,6 @@
380 used versions of programs, and to suggest to customers possible upgrades
381 and known bad versions of programs.
382
383-This feature can be disabled by specifying C<--no-version-check> on the
384-command line or in one of several L<"--config"> files, or by setting the
385-environment variable C<PERCONA_VERSION_CHECK=0>.
386-
387 For more information, visit L<http://www.percona.com/version-check>.
388
389 =back
390
391=== modified file 'bin/pt-table-checksum'
392--- bin/pt-table-checksum 2012-08-28 22:56:46 +0000
393+++ bin/pt-table-checksum 2012-08-29 20:29:19 +0000
394@@ -10828,9 +10828,7 @@
395
396 Show version and exit.
397
398-=item --[no]version-check
399-
400-default: yes
401+=item --version-check
402
403 Send program versions to Percona and print suggested upgrades and problems.
404
405@@ -10840,10 +10838,6 @@
406 used versions of programs, and to suggest to customers possible upgrades
407 and known bad versions of programs.
408
409-This feature can be disabled by specifying C<--no-version-check> on the
410-command line or in one of several L<"--config"> files, or by setting the
411-environment variable C<PERCONA_VERSION_CHECK=0>.
412-
413 For more information, visit L<http://www.percona.com/version-check>.
414
415 =item --where
416
417=== modified file 'bin/pt-table-sync'
418--- bin/pt-table-sync 2012-08-28 22:56:46 +0000
419+++ bin/pt-table-sync 2012-08-29 20:29:19 +0000
420@@ -12054,9 +12054,7 @@
421
422 Show version and exit.
423
424-=item --[no]version-check
425-
426-default: yes
427+=item --version-check
428
429 Send program versions to Percona and print suggested upgrades and problems.
430
431@@ -12066,10 +12064,6 @@
432 used versions of programs, and to suggest to customers possible upgrades
433 and known bad versions of programs.
434
435-This feature can be disabled by specifying C<--no-version-check> on the
436-command line or in one of several L<"--config"> files, or by setting the
437-environment variable C<PERCONA_VERSION_CHECK=0>.
438-
439 For more information, visit L<http://www.percona.com/version-check>.
440
441 =item --wait
442
443=== modified file 'bin/pt-upgrade'
444--- bin/pt-upgrade 2012-08-28 22:56:46 +0000
445+++ bin/pt-upgrade 2012-08-29 20:29:19 +0000
446@@ -12635,9 +12635,7 @@
447
448 Show version and exit.
449
450-=item --[no]version-check
451-
452-default: yes
453+=item --version-check
454
455 Send program versions to Percona and print suggested upgrades and problems.
456
457@@ -12647,10 +12645,6 @@
458 used versions of programs, and to suggest to customers possible upgrades
459 and known bad versions of programs.
460
461-This feature can be disabled by specifying C<--no-version-check> on the
462-command line or in one of several L<"--config"> files, or by setting the
463-environment variable C<PERCONA_VERSION_CHECK=0>.
464-
465 For more information, visit L<http://www.percona.com/version-check>.
466
467 =item --zero-query-times
468
469=== modified file 'bin/pt-variable-advisor'
470--- bin/pt-variable-advisor 2012-08-28 01:30:48 +0000
471+++ bin/pt-variable-advisor 2012-08-29 20:29:19 +0000
472@@ -5393,9 +5393,7 @@
473
474 Show version and exit.
475
476-=item --[no]version-check
477-
478-default: yes
479+=item --version-check
480
481 Send program versions to Percona and print suggested upgrades and problems.
482
483@@ -5405,10 +5403,6 @@
484 used versions of programs, and to suggest to customers possible upgrades
485 and known bad versions of programs.
486
487-This feature can be disabled by specifying C<--no-version-check> on the
488-command line or in one of several L<"--config"> files, or by setting the
489-environment variable C<PERCONA_VERSION_CHECK=0>.
490-
491 For more information, visit L<http://www.percona.com/version-check>.
492
493 =back
494
495=== modified file 'lib/PerconaTest.pm'
496--- lib/PerconaTest.pm 2012-08-28 21:28:34 +0000
497+++ lib/PerconaTest.pm 2012-08-29 20:29:19 +0000
498@@ -83,10 +83,6 @@
499
500 our $can_load_data = can_load_data();
501
502-# We do not want every test doing the version-check;
503-# that would be quite slow.
504-$ENV{PERCONA_VERSION_CHECK} = 0;
505-
506 our $dsn_opts = [
507 {
508 key => 'A',
509
510=== modified file 't/pt-archiver/version_check.t'
511--- t/pt-archiver/version_check.t 2012-08-27 23:10:42 +0000
512+++ t/pt-archiver/version_check.t 2012-08-29 20:29:19 +0000
513@@ -18,9 +18,6 @@
514 use Time::HiRes qw(time);
515 require "$trunk/bin/pt-archiver";
516
517-# PerconaTest.pm sets this because normal tests shouldn't v-c.
518-delete $ENV{PERCONA_VERSION_CHECK};
519-
520 my $dp = new DSNParser(opts=>$dsn_opts);
521 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
522 my $master_dbh = $sb->get_dbh_for('master');
523@@ -43,7 +40,7 @@
524 $sb->create_dbs($master_dbh, ['test']);
525 $sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
526
527-$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
528+$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
529
530 like(
531 $output,
532@@ -67,7 +64,7 @@
533 # v-c file should limit checks to 1 per 24 hours
534 # ###########################################################################
535
536-$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
537+$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
538
539 like(
540 $output,
541@@ -83,7 +80,7 @@
542
543 my $t0 = time;
544
545-$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
546+$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
547
548 my $t = time - $t0;
549
550@@ -105,17 +102,18 @@
551 );
552
553 # ###########################################################################
554-# Disable the v-c.
555+# Disable the v-c (for now it's disabled by default, so by "disable" here
556+# we just mean "don't pass --version-check").
557 # ###########################################################################
558
559 unlink $check_time_file if -f $check_time_file;
560
561-$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --no-version-check 2>&1`;
562+$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
563
564 unlike(
565 $output,
566 qr/(?:VersionCheck|Pingback|Percona suggests)/,
567- "Looks like --no-version-check disabled the version-check"
568+ "Looks like no --version-check disabled the version-check"
569 ) or diag($output);
570
571 ok(
572@@ -126,7 +124,7 @@
573 # PERCONA_VERSION_CHECK=0 is handled in Pingback, so it will print a line
574 # for PTVCDEBUG saying why it didn't run. So we just check that it doesn't
575 # create the file which also signifies that it didn't run.
576-$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
577+$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
578
579 ok(
580 !-f $check_time_file,
581
582=== modified file 't/pt-query-digest/version_check.t'
583--- t/pt-query-digest/version_check.t 2012-08-27 23:10:42 +0000
584+++ t/pt-query-digest/version_check.t 2012-08-29 20:29:19 +0000
585@@ -18,9 +18,6 @@
586 use Time::HiRes qw(time);
587 require "$trunk/bin/pt-query-digest";
588
589-# PerconaTest.pm sets this because normal tests shouldn't v-c.
590-delete $ENV{PERCONA_VERSION_CHECK};
591-
592 my $output;
593 my $cmd = "$trunk/bin/pt-query-digest --limit 1 $trunk/t/lib/samples/slowlogs/slow001.txt";
594
595@@ -29,7 +26,7 @@
596 my $check_time_file = File::Spec->catfile($dir,'percona-toolkit-version-check');
597 unlink $check_time_file if -f $check_time_file;
598
599-$output = `PTVCDEBUG=1 $cmd 2>&1`;
600+$output = `PTVCDEBUG=1 $cmd --version-check 2>&1`;
601
602 like(
603 $output,
604@@ -52,7 +49,7 @@
605 # v-c file should limit checks to 1 per 24 hours
606 # ###########################################################################
607
608-$output = `PTVCDEBUG=1 $cmd 2>&1`;
609+$output = `PTVCDEBUG=1 $cmd --version-check 2>&1`;
610
611 like(
612 $output,
613@@ -68,7 +65,7 @@
614
615 my $t0 = time;
616
617-$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd 2>&1`;
618+$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd --version-check 2>&1`;
619
620 my $t = time - $t0;
621
622@@ -90,12 +87,13 @@
623 );
624
625 # ###########################################################################
626-# Disable the v-c.
627+# Disable the v-c (for now it's disabled by default, so by "disable" here
628+# we just mean "don't pass --version-check").
629 # ###########################################################################
630
631 unlink $check_time_file if -f $check_time_file;
632
633-$output = `PTVCDEBUG=1 $cmd --no-version-check 2>&1`;
634+$output = `PTVCDEBUG=1 $cmd 2>&1`;
635
636 unlike(
637 $output,
638@@ -111,7 +109,7 @@
639 # PERCONA_VERSION_CHECK=0 is handled in Pingback, so it will print a line
640 # for PTVCDEBUG saying why it didn't run. So we just check that it doesn't
641 # create the file which also signifies that it didn't run.
642-$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd 2>&1`;
643+$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd --version-check 2>&1`;
644
645 ok(
646 !-f $check_time_file,

Subscribers

People subscribed via source and target branches