percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-05-17 01:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pt-show-grant-ask-pass-print-Enter-password-in-stdout-1290911.

Browse Source
This commit is contained in:
Daniel Nichter
2014-05-27 18:15:25 -07:00
parent d13575b7a8 eeedabfc14
commit ac378ca60d
28 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-agent
+1 -1
View File
@@ -3381,7 +3381,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-align
+1 -1
View File
@@ -866,7 +866,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-archiver
+1 -1
View File
@@ -1593,7 +1593,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-config-diff
+1 -1
View File
@@ -1593,7 +1593,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-deadlock-logger
+1 -1
View File
@@ -943,7 +943,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-diskstats
+1 -1
View File
@@ -939,7 +939,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-duplicate-key-checker
+1 -1
View File
@@ -1927,7 +1927,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-fifo-split
+1 -1
View File
@@ -867,7 +867,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-find
+1 -1
View File
@@ -1359,7 +1359,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-fingerprint
+1 -1
View File
@@ -868,7 +868,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-fk-error-logger
+1 -1
View File
@@ -938,7 +938,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-heartbeat
+1 -1
View File
@@ -1675,7 +1675,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-index-usage
+1 -1
View File
@@ -1520,7 +1520,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-kill
+1 -1
View File
@@ -948,7 +948,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-online-schema-change
+1 -1
View File
@@ -955,7 +955,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-query-digest
+1 -1
View File
@@ -2188,7 +2188,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-show-grants
+1 -1
View File
@@ -868,7 +868,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-slave-delay
+1 -1
View File
@@ -941,7 +941,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-slave-find
+1 -1
View File
@@ -876,7 +876,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-slave-restart
+1 -1
View File
@@ -1093,7 +1093,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-table-checksum
+1 -1
View File
@@ -2605,7 +2605,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-table-sync
+1 -1
View File
@@ -956,7 +956,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-table-usage
+1 -1
View File
@@ -1305,7 +1305,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-upgrade
+1 -1
View File
@@ -2185,7 +2185,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-variable-advisor
+1 -1
View File
@@ -945,7 +945,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
bin/pt-visual-explain
+1 -1
View File
@@ -1542,7 +1542,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
lib/OptionParser.pm
+1 -1
View File
@@ -1090,7 +1090,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1;
print $prompt
print STDERR $prompt
or die "Cannot print: $OS_ERROR";
my $response;
eval {
t/lib/OptionParser.t
+29
View File
@@ -2117,6 +2117,32 @@ is(
"--optimize got its value (bug 1199589)"
);
# #############################################################################
# Issue 1290911 : prompt_noecho should send prompt to STDERR so user can
# direct STDOUT to a file and still see the prompt
# #############################################################################
$o = new OptionParser();
$output = output(
sub {
my $input = "thepassword";
local *STDIN;
open STDIN, '<', \$input;
$o->prompt_noecho('Test Prompt:'); },
stderr=>1,
);
is (
$output,
"Test Prompt:\n",
'prompt_no_echo outputs prompt to STDERR'
);
# #############################################################################
# Done.
# #############################################################################
@@ -2133,3 +2159,6 @@ like(
done_testing;
exit;