From b449127680d55d6df8cfad4cfb1a7e8b585b2b3c Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 8 Apr 2015 14:40:34 +0200 Subject: [PATCH] Do not adjust the collation when querying host names refs #8613 --- .../library/Monitoring/Backend/Ido/Query/StatusQuery.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php index 0fb799f481..3f7bcf286e 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php @@ -35,7 +35,7 @@ public function setMode($mode) protected $columnMap = array( 'hosts' => array( 'host' => 'ho.name1 COLLATE latin1_general_ci', - 'host_name' => 'ho.name1 COLLATE latin1_general_ci', + 'host_name' => 'ho.name1', 'host_display_name' => 'h.display_name', 'host_alias' => 'h.alias', 'host_address' => 'h.address', @@ -168,7 +168,8 @@ public function setMode($mode) 'servicegroup_alias' => 'sg.alias' ), 'services' => array( - 'service_host_name' => 'so.name1 COLLATE latin1_general_ci', + 'service_host' => 'so.name1 COLLATE latin1_general_ci', + 'service_host_name' => 'so.name1', 'service' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2 COLLATE latin1_general_ci', 'service_display_name' => 's.display_name',