From: Penny Leach <penny@liip.ch>
Date: Wed, 13 Jan 2010 02:46:12 +0000 (+0000)
Subject: mnet MDL-21328   fixed non unique first field sql in mnet_services.php
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c684febcc3c9700d7f8c54af8a17d8ae2642571f;p=moodle.git

mnet MDL-21328   fixed non unique first field sql in mnet_services.php

merged from MOODLE_19_STABLE
---

diff --git a/admin/mnet/mnet_services.php b/admin/mnet/mnet_services.php
index 04c0116792..f92cbf3136 100644
--- a/admin/mnet/mnet_services.php
+++ b/admin/mnet/mnet_services.php
@@ -83,7 +83,7 @@
             $id_list .= ', '.$CFG->mnet_all_hosts_id;
         }
 
-        $concat = $DB->sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
+        $concat = $DB->sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id', '\'-\'', 'r.parent_type', '\'-\'', 'r.parent');
 
         $query = "
             SELECT DISTINCT