From 4b7ce24266e26f830e4417fe161e1df526eeda44 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Sat, 21 Nov 2009 14:57:01 +0000
Subject: [PATCH] FServerVersionUntouched is a static variable, not a complex
 function, so it's very OK to call it several times

---
 source/mysql_connection.pas | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/source/mysql_connection.pas b/source/mysql_connection.pas
index 7cd7b388..3cc1b5fc 100644
--- a/source/mysql_connection.pas
+++ b/source/mysql_connection.pas
@@ -408,29 +408,27 @@ end;
 function TMySQLConnection.GetServerVersionInt: Integer;
 var
   i, dots: Byte;
-  fullversion, v1, v2, v3: String;
+  v1, v2, v3: String;
 begin
   Result := -1;
 
   dots := 0;
-  // Avoid calling GetServerVersionUntouched too often
-  fullversion := ServerVersionUntouched;
   v1 := '';
   v2 := '';
   v3 := '';
-  for i:=1 to Length(fullversion) do begin
-    if fullversion[i] = '.' then begin
+  for i:=1 to Length(FServerVersionUntouched) do begin
+    if FServerVersionUntouched[i] = '.' then begin
       inc(dots);
       // We expect exactly 2 dots.
       if dots > 2 then
         break;
-    end else if fullversion[i] in ['0'..'9'] then begin
+    end else if FServerVersionUntouched[i] in ['0'..'9'] then begin
       if dots = 0 then
-        v1 := v1 + fullversion[i]
+        v1 := v1 + FServerVersionUntouched[i]
       else if dots = 1 then
-        v2 := v2 + fullversion[i]
+        v2 := v2 + FServerVersionUntouched[i]
       else if dots = 2 then
-        v3 := v3 + fullversion[i];
+        v3 := v3 + FServerVersionUntouched[i];
     end else // Don't include potential numbers of trailing string
       break;
   end;