percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use /*!50038 @@hostname */ in Cxn.

Browse Source
This commit is contained in:
Daniel Nichter
2013-04-04 15:44:42 -06:00
parent adc2e8ca80
commit fae1c06a44
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-config-diff
View File

@@ -1536,9 +1536,9 @@ sub set_dbh {
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc}; $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
my $sql = 'SELECT @@hostname, @@server_id'; my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my ($hostname, $server_id) = $dbh->selectrow_array($sql); my ($server_id, $hostname) = $dbh->selectrow_array($sql);
PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id); PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
if ( $hostname ) { if ( $hostname ) {
$self->{hostname} = $hostname; $self->{hostname} = $hostname;

4
bin/pt-kill
View File

@@ -4792,9 +4792,9 @@ sub set_dbh {
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc}; $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
my $sql = 'SELECT @@hostname, @@server_id'; my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my ($hostname, $server_id) = $dbh->selectrow_array($sql); my ($server_id, $hostname) = $dbh->selectrow_array($sql);
PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id); PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
if ( $hostname ) { if ( $hostname ) {
$self->{hostname} = $hostname; $self->{hostname} = $hostname;

4
bin/pt-online-schema-change
View File

@@ -3774,9 +3774,9 @@ sub set_dbh {
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc}; $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
my $sql = 'SELECT @@hostname, @@server_id'; my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my ($hostname, $server_id) = $dbh->selectrow_array($sql); my ($server_id, $hostname) = $dbh->selectrow_array($sql);
PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id); PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
if ( $hostname ) { if ( $hostname ) {
$self->{hostname} = $hostname; $self->{hostname} = $hostname;

4
bin/pt-table-checksum
View File

@@ -3308,9 +3308,9 @@ sub set_dbh {
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc}; $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
my $sql = 'SELECT @@hostname, @@server_id'; my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my ($hostname, $server_id) = $dbh->selectrow_array($sql); my ($server_id, $hostname) = $dbh->selectrow_array($sql);
PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id); PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
if ( $hostname ) { if ( $hostname ) {
$self->{hostname} = $hostname; $self->{hostname} = $hostname;

4
lib/Cxn.pm
View File

@@ -155,9 +155,9 @@ sub set_dbh {
# Update the cxn's name. Until we connect, the DSN parts # Update the cxn's name. Until we connect, the DSN parts
# h and P are used. Once connected, use @@hostname. # h and P are used. Once connected, use @@hostname.
my $sql = 'SELECT @@hostname, @@server_id'; my $sql = 'SELECT @@server_id /*!50038 , @@hostname*/';
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my ($hostname, $server_id) = $dbh->selectrow_array($sql); my ($server_id, $hostname) = $dbh->selectrow_array($sql);
PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id); PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
if ( $hostname ) { if ( $hostname ) {
$self->{hostname} = $hostname; $self->{hostname} = $hostname;