From 921948fff357ea8b321b5535a50ae4ec2bc96ccb Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 26 Feb 2018 23:29:08 -0500
Subject: [PATCH] Updated mysql to 6.10.6

---
 Source/Framework/Database/MySqlBase.cs | 16 ++++++----------
 Source/Framework/Framework.csproj      |  3 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Source/Framework/Database/MySqlBase.cs b/Source/Framework/Database/MySqlBase.cs
index 0a80ff0ae..f10bf2cde 100644
--- a/Source/Framework/Database/MySqlBase.cs
+++ b/Source/Framework/Database/MySqlBase.cs
@@ -129,16 +129,14 @@ namespace Framework.Database
 
                         using (var reader = cmd.ExecuteReader())
                         {
-                            if (reader.Read() && reader.HasRows)
+                            if (reader.HasRows)
                             {
-                                do
+                                while(reader.Read())
                                 {
                                     var row = new object[reader.FieldCount];
-
                                     reader.GetValues(row);
                                     rows.Add(row);
                                 }
-                                while (reader.Read());
                             }
                         }
                     }
@@ -180,16 +178,15 @@ namespace Framework.Database
 
                         using (var reader = await cmd.ExecuteReaderAsync())
                         {
-                            if (await reader.ReadAsync() && reader.HasRows)
+                            if (reader.HasRows)
                             {
-                                do
+                                while (await reader.ReadAsync())
                                 {
                                     var row = new object[reader.FieldCount];
 
                                     reader.GetValues(row);
                                     rows.Add(row);
                                 }
-                                while (await reader.ReadAsync());
                             }
                         }
                     }
@@ -225,16 +222,15 @@ namespace Framework.Database
                             query = cmd.CommandText;
                             using (var reader = await cmd.ExecuteReaderAsync())
                             {
-                                if (await reader.ReadAsync() && reader.HasRows)
+                                if (reader.HasRows)
                                 {
-                                    do
+                                    while (await reader.ReadAsync())
                                     {
                                         var row = new object[reader.FieldCount];
 
                                         reader.GetValues(row);
                                         rows.Add(row);
                                     }
-                                    while (await reader.ReadAsync());
                                 }
                             }
                         }
diff --git a/Source/Framework/Framework.csproj b/Source/Framework/Framework.csproj
index 8a9b8e6b3..4ef1ba773 100644
--- a/Source/Framework/Framework.csproj
+++ b/Source/Framework/Framework.csproj
@@ -11,7 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="6.10.4" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+    <PackageReference Include="MySql.Data" Version="6.10.6" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
   </ItemGroup>