diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 4696244a..58c0311e 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -2281,9 +2281,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index baed4824..63402656 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -2625,9 +2625,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index b098d3b4..1c077313 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -1782,9 +1782,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;
diff --git a/bin/pt-kill b/bin/pt-kill
index 60a4b2e9..420e81b6 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -5112,9 +5112,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index cd7e2871..2d3fddab 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -3741,9 +3741,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 4c71ba02..00e51978 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -3519,9 +3519,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 781aaf31..6a2dead4 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -2450,9 +2450,9 @@ sub set_dbh {
 
    $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);
-   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   my ($server_id, $hostname) = $dbh->selectrow_array($sql);
    PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
    if ( $hostname ) {
       $self->{hostname} = $hostname;