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

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

  1. hostname-bug-947893-2.1
  2. Merge into 2.1
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 530
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/hostname-bug-947893-2.1
Merge into: lp:percona-toolkit/2.1
Diff against target: 79 lines (+10/-10)
5 files modified
bin/pt-config-diff (+2/-2)
bin/pt-kill (+2/-2)
bin/pt-online-schema-change (+2/-2)
bin/pt-table-checksum (+2/-2)
lib/Cxn.pm (+2/-2)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/hostname-bug-947893-2.1
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+157239@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-02-11 17:31:15 +0000
3+++ bin/pt-config-diff 2013-04-04 21:48:29 +0000
4@@ -1536,9 +1536,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-kill'
18--- bin/pt-kill 2013-02-11 17:31:15 +0000
19+++ bin/pt-kill 2013-04-04 21:48:29 +0000
20@@ -4792,9 +4792,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-online-schema-change'
34--- bin/pt-online-schema-change 2013-02-11 17:31:15 +0000
35+++ bin/pt-online-schema-change 2013-04-04 21:48:29 +0000
36@@ -3774,9 +3774,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-table-checksum'
50--- bin/pt-table-checksum 2013-02-11 17:31:15 +0000
51+++ bin/pt-table-checksum 2013-04-04 21:48:29 +0000
52@@ -3308,9 +3308,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 'lib/Cxn.pm'
66--- lib/Cxn.pm 2013-01-03 00:19:16 +0000
67+++ lib/Cxn.pm 2013-04-04 21:48:29 +0000
68@@ -155,9 +155,9 @@
69
70 # Update the cxn's name. Until we connect, the DSN parts
71 # h and P are used. Once connected, use @@hostname.
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;

Subscribers

People subscribed via source and target branches