From 6e2bca2ffad9f7f5f62dea80c04a8402a838251d Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 3 Jun 2019 20:10:31 +0200
Subject: [PATCH] Fix compiler warning: "For loop control variable must be
 simple local variable"

---
 source/dbconnection.pas | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 39c7d59b9..0cc48825a 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -2255,7 +2255,8 @@ procedure TDBConnection.DoBeforeConnect;
 
 procedure TMySQLConnection.DoBeforeConnect;
 var
-  msg: String;
+  msg,
+  TryLibraryPath: String;
   OldErrorMode: Cardinal;
   TryLibraryPaths: TStringList;
 begin
@@ -2270,17 +2271,18 @@ procedure TMySQLConnection.DoBeforeConnect;
     TryLibraryPaths.Add('libmariadb.dll');
     TryLibraryPaths.Add('libmysql.dll');
 
-    for LibMysqlPath in TryLibraryPaths do begin
-      Log(lcDebug, f_('Loading library file %s ...', [LibMysqlPath]));
+    for TryLibraryPath in TryLibraryPaths do begin
+      Log(lcDebug, f_('Loading library file %s ...', [TryLibraryPath]));
       // Temporarily suppress error popups while loading new library on Windows XP, see #79
       OldErrorMode := SetErrorMode(SEM_FAILCRITICALERRORS);
       SetErrorMode(OldErrorMode or SEM_FAILCRITICALERRORS);
-      LibMysqlHandle := LoadLibrary(PWideChar(LibMysqlPath));
+      LibMysqlHandle := LoadLibrary(PWideChar(TryLibraryPath));
       SetErrorMode(OldErrorMode);
       if LibMysqlHandle = 0 then begin
         // Win XP needs libmysql.dll
-        Log(lcDebug, f_('Could not load %s', [LibMysqlPath]));
+        Log(lcDebug, f_('Could not load %s', [TryLibraryPath]));
       end else begin
+        LibMysqlPath := TryLibraryPath;
         Break;
       end;
     end;