MP1-5219: For older OS we use the old connection string

MediaPortal · May 31, 2024 · 6046adf · 6046adf
1 parent bc9d9ba
commit 6046adf
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/TvEngine3/TVLibrary/SetupTv/SetupDatabaseForm.cs b/TvEngine3/TVLibrary/SetupTv/SetupDatabaseForm.cs
@@ -204,7 +204,14 @@ private string ComposeConnectionString(string server, string userid, string pass
           {
             database = "mysql";
           }
-          return String.Format("Server={0};Database={3};User ID={1};Password={2};charset=utf8;Connection Timeout={4};commandinterceptors=Gentle.Provider.MySQL.Interceptor.Interceptor,Gentle.Provider.MySQL.Interceptor;",
+          if (OSInfo.OSInfo.Win10OrLater() && Utils.Is64bitOS)
+          {
+            Log.Write("MariaDB / MySQL: Use the new connection string.");
+            return String.Format("Server={0};Database={3};User ID={1};Password={2};charset=utf8;Connection Timeout={4};commandinterceptors=Gentle.Provider.MySQL.Interceptor.Interceptor,Gentle.Provider.MySQL.Interceptor;",
+                                 server, userid, password, database, timeout);
+          }
+          Log.Write("MySQL: Use the old connection string.");
+          return String.Format("Server={0};Database={3};User ID={1};Password={2};charset=utf8;Connection Timeout={4};",
                                server, userid, password, database, timeout);
 
         // MS SQL