From 414af8a1ebd7929db314269eb2f1b0c2d393fda9 Mon Sep 17 00:00:00 2001
From: Frank Fegert <frankfegert@users.sf.net>
Date: Sun, 12 Jul 2009 19:33:28 +0000
Subject: [PATCH] - Fixed typo with ADODB result set introduced in previous
 revision. - For PollD_MP run getServerVersion() only once every polling
 inter-   val, not for every query.

---
 includes/adodb.php | 2 +-
 includes/polld.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/adodb.php b/includes/adodb.php
index 82ed314..c2b356c 100644
--- a/includes/adodb.php
+++ b/includes/adodb.php
@@ -258,7 +258,7 @@ class ADOdb {
         $recordArray = array();
         $this->conn->SetFetchMode(ADODB_FETCH_ASSOC);
         try {
-            $recordSet = $this->conn->Execute($sql);
+            $recordSet = &$this->conn->Execute($sql);
         } catch (exception $e) {
             $this->writeMSG(adodb_backtrace($e->gettrace()));
             exit;
diff --git a/includes/polld.php b/includes/polld.php
index a9c6a2c..c40441a 100644
--- a/includes/polld.php
+++ b/includes/polld.php
@@ -695,6 +695,7 @@ class PollD {
 class PollD_MP {
 
     var $cfg;
+	var $servers;
     var $queries;
     var $lastrun;
     var $overviewqueries;
@@ -908,6 +909,7 @@ class PollD_MP {
         $servers = array();
         while (list ($key, $val) = each ($rows)) {
             $servers[$val["servername"]] = (array)$val;
+            $servers[$val["servername"]]["version"] = $this->getServerVersion($val);
         }
         return $servers;
     }
@@ -1141,7 +1143,7 @@ class PollD_MP {
         $starttquery = time();
         $querytime = 0;
 
-		$version = $this->getServerVersion($server["servername"]);
+		$version = $this->servers[$server]["version"];
 
         $logprefix = "Worker(".$this->child_pid.") ".sprintf('%-16s', $server)." ---------".$query["name"];
         $tablename = "res_".$query["name"]."_".$server;
@@ -1214,7 +1216,7 @@ class PollD_MP {
         $starttquery = time();
         $querytime = 0;
 
-		$version = $this->getServerVersion($server["servername"]);
+		$version = $this->servers[$server]["version"];
 
         $tablename = "res_overview_".$server;
         $logprefix = "Worker(".$this->child_pid.") ".sprintf('%-16s', $server)." ---------".$query["name"];