#At file:///C:/Documents%20and%20Settings/Reggie/work/connector-net/6.3/ based on revid:reggie.burnett@stripped
954 Reggie Burnett 2010-12-14 [merge]
merged
modified:
CHANGES
MySQLClient.sln
MySql.Data/Provider/Source/datareader.cs
MySql.Data/Tests/Source/CommandTests.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES 2010-12-09 03:38:07 +0000
+++ b/CHANGES 2010-12-14 15:25:24 +0000
@@ -17,6 +17,8 @@
- fixed bug where older versions of MySQL would present cast(0 as decimal(0,0)) as string
that caused our EF code to throw an exception as it tried to convert that to bool
(bug #55349)
+- change reader to close the connection if CommandBehavior.CloseConnection is given and an
+ exception is generated (bug #58652)
Version 6.3.5
- Fix installer bug related to .NET FW 4.0 (bug #56580)
=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln 2010-08-30 20:17:30 +0000
+++ b/MySQLClient.sln 2010-12-14 15:25:24 +0000
@@ -3,7 +3,7 @@
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "MySql.Web\Providers\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests", "MySql.Web\Tests\MySql.Web.Tests.csproj", "{DC704374-EC50-4167-93AA-8D262136502E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests", "MySql.Web\Tests\MySql.Web.Tests.csproj", "{83462D15-E576-4079-BBC9-9EE1CF0B24DD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "MySql.Data\Provider\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
EndProject
@@ -15,9 +15,9 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "MySql.Data.Entity\Provider\MySql.Data.Entity.csproj", "{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "MySql.Data.Entity\Provider\MySql.Data.Entity.csproj", "{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{77EC4E20-293A-48BA-8415-D0AD869D91FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
ProjectSection(ProjectDependencies) = postProject
@@ -76,30 +76,30 @@
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x64.ActiveCfg = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x86.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|x64.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|x86.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Any CPU.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|x64.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|x86.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Any CPU.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|x64.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|x86.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Any CPU.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|x86.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Any CPU.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|x64.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|x86.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|x64.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|x86.ActiveCfg = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.Build.0 = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -224,54 +224,54 @@
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|x64.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|x86.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Any CPU.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|x64.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|x86.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Any CPU.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|x64.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|x86.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|x64.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|x86.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|x64.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Any CPU.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|x64.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|x86.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Any CPU.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|x64.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|x86.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Any CPU.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|x86.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Any CPU.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|x64.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|x86.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|x64.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|x86.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Any CPU.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|x86.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Any CPU.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|x64.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|x86.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|x64.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|x86.ActiveCfg = Release|Any CPU
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|x86
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
=== modified file 'MySql.Data/Provider/Source/datareader.cs'
--- a/MySql.Data/Provider/Source/datareader.cs 2010-08-18 19:52:04 +0000
+++ b/MySql.Data/Provider/Source/datareader.cs 2010-12-14 15:25:24 +0000
@@ -912,6 +912,8 @@
connection.Abort();
if (ex.Number == 0)
throw new MySqlException(Resources.FatalErrorReadingResult, ex);
+ if ((commandBehavior & CommandBehavior.CloseConnection) != 0)
+ Close();
throw;
}
}
=== modified file 'MySql.Data/Tests/Source/CommandTests.cs'
--- a/MySql.Data/Tests/Source/CommandTests.cs 2010-11-30 18:44:43 +0000
+++ b/MySql.Data/Tests/Source/CommandTests.cs 2010-12-14 15:25:24 +0000
@@ -464,6 +464,29 @@
}
}
}
+
+ /// <summary>
+ /// Bug #58652 ExecuteReader throws NullReferenceException when using CommandBehavior.Close
+ /// </summary>
+ [Test]
+ public void SyntaxErrorWithCloseConnection()
+ {
+ string connStr = GetConnectionString(true);
+ using (MySqlConnection c = new MySqlConnection(connStr))
+ {
+ c.Open();
+ MySqlCommand cmd = new MySqlCommand("SELE 1", c);
+ try
+ {
+ cmd.ExecuteReader(CommandBehavior.CloseConnection);
+ Assert.Fail("This should have failed");
+ }
+ catch (MySqlException)
+ {
+ }
+ Assert.IsTrue(c.State == ConnectionState.Closed);
+ }
+ }
}
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
| Thread |
|---|
| • bzr commit into connector-net-trunk branch (reggie.burnett:954) | Reggie Burnett | 14 Dec |
