Preserve original exception.

This may help with diagnosis of exceptions thrown from ActivateResultSet.

Author: bgrainger

src/MySqlConnector/MySqlClient/MySqlDataReader.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
@@ -70,7 +70,11 @@ internal async Task<bool> NextResultAsync(IOBehavior ioBehavior, CancellationTok
 		private void ActivateResultSet(ResultSet resultSet)
 		{
 			if (resultSet.ReadResultSetHeaderException != null)
-				throw resultSet.ReadResultSetHeaderException;
+			{
+				throw resultSet.ReadResultSetHeaderException is MySqlException mySqlException ?
+					new MySqlException(mySqlException.Number, mySqlException.SqlState, mySqlException.Message, mySqlException) :
+					resultSet.ReadResultSetHeaderException;
+			}
 
 			Command.LastInsertedId = resultSet.LastInsertId;
 			m_recordsAffected += resultSet.RecordsAffected;

tests/SideBySide/BulkLoaderAsync.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -149,16 +149,15 @@ public async Task BulkLoadCsvFileNotFound()
 			{
 				int rowCount = await bl.LoadAsync();
 			}
-			catch (MySqlException mySqlException)
+			catch (Exception exception)
 			{
-				if (mySqlException.InnerException != null)
-				{
-					Assert.IsType(typeof(System.IO.FileNotFoundException), mySqlException.InnerException);
-				}
-				else
+				while (exception.InnerException != null)
+					exception = exception.InnerException;
+
+				if (!(exception is FileNotFoundException))
 				{
-					Assert.Contains("Errcode: 2 ", mySqlException.Message);
-					Assert.Contains("No such file or directory", mySqlException.Message);
+					Assert.Contains("Errcode: 2 ", exception.Message);
+					Assert.Contains("No such file or directory", exception.Message);
 				}
 			}
 		}

tests/SideBySide/BulkLoaderSync.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using MySql.Data.MySqlClient;
@@ -151,16 +151,15 @@ public void BulkLoadCsvFileNotFound()
 			{
 				int rowCount = bl.Load();
 			}
-			catch (MySqlException mySqlException)
+			catch (Exception exception)
 			{
-				if (mySqlException.InnerException != null)
-				{
-					Assert.IsType(typeof(System.IO.FileNotFoundException), mySqlException.InnerException);
-				}
-				else
+				while (exception.InnerException != null)
+					exception = exception.InnerException;
+
+				if (!(exception is FileNotFoundException))
 				{
-					Assert.Contains("Errcode: 2 ", mySqlException.Message);
-					Assert.Contains("No such file or directory", mySqlException.Message);
+					Assert.Contains("Errcode: 2 ", exception.Message);
+					Assert.Contains("No such file or directory", exception.Message);
 				}
 			}
 		}