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

Merge lp:~percona-toolkit-dev/percona-toolkit/hostname-bug-947893-2.2 into lp:percona-toolkit/2.2

  1. hostname-bug-947893-2.2
  2. Merge into 2.2
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 570
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/hostname-bug-947893-2.2
Merge into: lp:percona-toolkit/2.2
Diff against target: 127 lines (+16/-16)
8 files modified
bin/pt-config-diff (+2/-2)
bin/pt-deadlock-logger (+2/-2)
bin/pt-fk-error-logger (+2/-2)
bin/pt-kill (+2/-2)
bin/pt-online-schema-change (+2/-2)
bin/pt-table-checksum (+2/-2)
bin/pt-upgrade (+2/-2)
lib/Cxn.pm (+2/-2)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/hostname-bug-947893-2.2
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+157237@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-config-diff'
2--- bin/pt-config-diff 2013-03-20 17:53:36 +0000
3+++ bin/pt-config-diff 2013-04-04 21:35:30 +0000
4@@ -2281,9 +2281,9 @@
5
6 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
7
8- my $sql = 'SELECT @@hostname, @@server_id';
9+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
10 PTDEBUG && _d($dbh, $sql);
11- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
12+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
13 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
14 if ( $hostname ) {
15 $self->{hostname} = $hostname;
16
17=== modified file 'bin/pt-deadlock-logger'
18--- bin/pt-deadlock-logger 2013-03-20 17:53:36 +0000
19+++ bin/pt-deadlock-logger 2013-04-04 21:35:30 +0000
20@@ -2625,9 +2625,9 @@
21
22 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
23
24- my $sql = 'SELECT @@hostname, @@server_id';
25+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
26 PTDEBUG && _d($dbh, $sql);
27- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
28+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
29 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
30 if ( $hostname ) {
31 $self->{hostname} = $hostname;
32
33=== modified file 'bin/pt-fk-error-logger'
34--- bin/pt-fk-error-logger 2013-03-20 17:53:36 +0000
35+++ bin/pt-fk-error-logger 2013-04-04 21:35:30 +0000
36@@ -1782,9 +1782,9 @@
37
38 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
39
40- my $sql = 'SELECT @@hostname, @@server_id';
41+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
42 PTDEBUG && _d($dbh, $sql);
43- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
44+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
45 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
46 if ( $hostname ) {
47 $self->{hostname} = $hostname;
48
49=== modified file 'bin/pt-kill'
50--- bin/pt-kill 2013-03-20 17:53:36 +0000
51+++ bin/pt-kill 2013-04-04 21:35:30 +0000
52@@ -5112,9 +5112,9 @@
53
54 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
55
56- my $sql = 'SELECT @@hostname, @@server_id';
57+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
58 PTDEBUG && _d($dbh, $sql);
59- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
60+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
61 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
62 if ( $hostname ) {
63 $self->{hostname} = $hostname;
64
65=== modified file 'bin/pt-online-schema-change'
66--- bin/pt-online-schema-change 2013-03-20 17:53:36 +0000
67+++ bin/pt-online-schema-change 2013-04-04 21:35:30 +0000
68@@ -3741,9 +3741,9 @@
69
70 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
71
72- my $sql = 'SELECT @@hostname, @@server_id';
73+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
74 PTDEBUG && _d($dbh, $sql);
75- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
76+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
77 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
78 if ( $hostname ) {
79 $self->{hostname} = $hostname;
80
81=== modified file 'bin/pt-table-checksum'
82--- bin/pt-table-checksum 2013-03-20 17:53:36 +0000
83+++ bin/pt-table-checksum 2013-04-04 21:35:30 +0000
84@@ -3536,9 +3536,9 @@
85
86 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
87
88- my $sql = 'SELECT @@hostname, @@server_id';
89+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
90 PTDEBUG && _d($dbh, $sql);
91- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
92+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
93 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
94 if ( $hostname ) {
95 $self->{hostname} = $hostname;
96
97=== modified file 'bin/pt-upgrade'
98--- bin/pt-upgrade 2013-03-20 17:53:36 +0000
99+++ bin/pt-upgrade 2013-04-04 21:35:30 +0000
100@@ -2450,9 +2450,9 @@
101
102 $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
103
104- my $sql = 'SELECT @@hostname, @@server_id';
105+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
106 PTDEBUG && _d($dbh, $sql);
107- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
108+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
109 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
110 if ( $hostname ) {
111 $self->{hostname} = $hostname;
112
113=== modified file 'lib/Cxn.pm'
114--- lib/Cxn.pm 2013-03-13 18:38:45 +0000
115+++ lib/Cxn.pm 2013-04-04 21:35:30 +0000
116@@ -166,9 +166,9 @@
117
118 # Update the cxn's name. Until we connect, the DSN parts
119 # h and P are used. Once connected, use @@hostname.
120- my $sql = 'SELECT @@hostname, @@server_id';
121+ my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
122 PTDEBUG && _d($dbh, $sql);
123- my ($hostname, $server_id) = $dbh->selectrow_array($sql);
124+ my ($server_id, $hostname) = $dbh->selectrow_array($sql);
125 PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
126 if ( $hostname ) {
127 $self->{hostname} = $hostname;

Subscribers

People subscribed via source and target branches