Merge hostname-bug-947893-2.2.

This commit is contained in:
Daniel Nichter
2013-04-04 15:45:50 -06:00
8 changed files with 16 additions and 16 deletions

View File

@@ -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;