Modified:
branches/5.2/CHANGES
branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj
branches/5.2/MySql.Data/Provider/MySql.Data.csproj
branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs
branches/5.2/MySql.Data/Provider/Properties/Resources.resx
branches/5.2/MySql.Data/Provider/Source/BulkLoader.cs
branches/5.2/MySql.Data/Provider/Source/CommandBuilder.cs
branches/5.2/MySql.Data/Provider/Source/CompressedStream.cs
branches/5.2/MySql.Data/Provider/Source/Connection.cs
branches/5.2/MySql.Data/Provider/Source/Crypt.cs
branches/5.2/MySql.Data/Provider/Source/ISSchemaProvider.cs
branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
branches/5.2/MySql.Data/Provider/Source/MySqlPool.cs
branches/5.2/MySql.Data/Provider/Source/MySqlScript.cs
branches/5.2/MySql.Data/Provider/Source/MySqlStream.cs
branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs
branches/5.2/MySql.Data/Provider/Source/PerformanceMonitor.cs
branches/5.2/MySql.Data/Provider/Source/ProcedureCache.cs
branches/5.2/MySql.Data/Provider/Source/Statement.cs
branches/5.2/MySql.Data/Provider/Source/StoredProcedure.cs
branches/5.2/MySql.Data/Provider/Source/cf/BufferedStream.cs
branches/5.2/MySql.Data/Provider/Source/command.cs
branches/5.2/MySql.Data/Provider/Source/common/NamedPipeStream.cs
branches/5.2/MySql.Data/Provider/Source/common/Version.cs
branches/5.2/MySql.Data/Provider/Source/datareader.cs
branches/5.2/MySql.Data/Provider/Source/parameter_collection.cs
branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs
Log:
- Improved error reporting when a timeout occurs. It no longer uses a message like
'reading from stream failed'. (bug #38119)
Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/CHANGES 2008-07-18 20:51:08 UTC (rev 1345)
@@ -17,6 +17,8 @@
- Fixed documentation surrounding use of ? vs @ for parameters (bug #37349)
- Reduced network traffic for the normal case where the web provider schema is up
to date (bug #37469)
+- Improved error reporting when a timeout occurs. It no longer uses a message like
+ 'reading from stream failed'. (bug #38119)
Version 5.2.2 -
- Fixed profile provider that would throw an exception if you were updating
Modified: branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj
===================================================================
--- branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj 2008-07-18 20:51:08 UTC (rev 1345)
@@ -63,6 +63,7 @@
<Compile Include="Source\base\DbConnectionStringBuilder.cs" />
<Compile Include="Source\base\DbException.cs" />
<Compile Include="Source\cf\BufferedStream.cs" />
+ <Compile Include="Source\cf\CompilerGeneratedAttribute.cs" />
<Compile Include="Source\cf\WinCE.cs" />
<Compile Include="Source\CharSetMap.cs" />
<Compile Include="Source\command.cs">
Modified: branches/5.2/MySql.Data/Provider/MySql.Data.csproj
===================================================================
--- branches/5.2/MySql.Data/Provider/MySql.Data.csproj 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/MySql.Data.csproj 2008-07-18 20:51:08 UTC (rev 1345)
@@ -197,6 +197,8 @@
<EmbeddedResource Include="Properties\ReservedWords.txt" />
<EmbeddedResource Include="Properties\Resources.resx">
<SubType>Designer</SubType>
+ <Generator>PublicResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources1.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Content Include="Source\docs\MySqlCommand.xml" />
<Content Include="Source\docs\MySqlCommandBuilder.xml" />
Modified: branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.312
+// Runtime Version:2.0.50727.1434
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
-namespace MySql.Data.MySqlClient {
+namespace MySql.Data.MySqlClient.Properties {
using System;
@@ -21,18 +21,13 @@
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- internal class Resources {
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
-
-#if CF
- private const string resName = "MySql.Data.CF.Properties.Resources";
-#else
- private const string resName = "MySql.Data.MySqlClient.Properties.Resources";
-#endif
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
@@ -41,10 +36,10 @@
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
+ public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager(resName, typeof(Resources).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MySql.Data.MySqlClient.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -56,7 +51,7 @@
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
+ public static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -68,7 +63,7 @@
/// <summary>
/// Looks up a localized string similar to Improper MySqlCommandBuilder state: adapter is null.
/// </summary>
- internal static string AdapterIsNull {
+ public static string AdapterIsNull {
get {
return ResourceManager.GetString("AdapterIsNull", resourceCulture);
}
@@ -77,7 +72,7 @@
/// <summary>
/// Looks up a localized string similar to Improper MySqlCommandBuilder state: adapter's SelectCommand is null.
/// </summary>
- internal static string AdapterSelectIsNull {
+ public static string AdapterSelectIsNull {
get {
return ResourceManager.GetString("AdapterSelectIsNull", resourceCulture);
}
@@ -86,7 +81,7 @@
/// <summary>
/// Looks up a localized string similar to Version string not in acceptable format.
/// </summary>
- internal static string BadVersionFormat {
+ public static string BadVersionFormat {
get {
return ResourceManager.GetString("BadVersionFormat", resourceCulture);
}
@@ -95,7 +90,7 @@
/// <summary>
/// Looks up a localized string similar to The buffer cannot be null.
/// </summary>
- internal static string BufferCannotBeNull {
+ public static string BufferCannotBeNull {
get {
return ResourceManager.GetString("BufferCannotBeNull", resourceCulture);
}
@@ -104,7 +99,7 @@
/// <summary>
/// Looks up a localized string similar to Buffer is not large enough.
/// </summary>
- internal static string BufferNotLargeEnough {
+ public static string BufferNotLargeEnough {
get {
return ResourceManager.GetString("BufferNotLargeEnough", resourceCulture);
}
@@ -113,7 +108,7 @@
/// <summary>
/// Looks up a localized string similar to Canceling an executing query requires MySQL 5.0 or higher..
/// </summary>
- internal static string CancelNeeds50 {
+ public static string CancelNeeds50 {
get {
return ResourceManager.GetString("CancelNeeds50", resourceCulture);
}
@@ -122,7 +117,7 @@
/// <summary>
/// Looks up a localized string similar to Canceling an active query is only supported on MySQL 5.0.0 and above. .
/// </summary>
- internal static string CancelNotSupported {
+ public static string CancelNotSupported {
get {
return ResourceManager.GetString("CancelNotSupported", resourceCulture);
}
@@ -131,7 +126,7 @@
/// <summary>
/// Looks up a localized string similar to MySqlCommandBuilder does not support multi-table statements.
/// </summary>
- internal static string CBMultiTableNotSupported {
+ public static string CBMultiTableNotSupported {
get {
return ResourceManager.GetString("CBMultiTableNotSupported", resourceCulture);
}
@@ -140,7 +135,7 @@
/// <summary>
/// Looks up a localized string similar to MySqlCommandBuilder cannot operate on tables with no unique or key columns.
/// </summary>
- internal static string CBNoKeyColumn {
+ public static string CBNoKeyColumn {
get {
return ResourceManager.GetString("CBNoKeyColumn", resourceCulture);
}
@@ -149,7 +144,7 @@
/// <summary>
/// Looks up a localized string similar to Chaos isolation level is not supported.
/// </summary>
- internal static string ChaosNotSupported {
+ public static string ChaosNotSupported {
get {
return ResourceManager.GetString("ChaosNotSupported", resourceCulture);
}
@@ -158,7 +153,7 @@
/// <summary>
/// Looks up a localized string similar to The CommandText property has not been properly initialized..
/// </summary>
- internal static string CommandTextNotInitialized {
+ public static string CommandTextNotInitialized {
get {
return ResourceManager.GetString("CommandTextNotInitialized", resourceCulture);
}
@@ -167,7 +162,7 @@
/// <summary>
/// Looks up a localized string similar to The connection is already open..
/// </summary>
- internal static string ConnectionAlreadyOpen {
+ public static string ConnectionAlreadyOpen {
get {
return ResourceManager.GetString("ConnectionAlreadyOpen", resourceCulture);
}
@@ -176,7 +171,7 @@
/// <summary>
/// Looks up a localized string similar to Connection unexpectedly terminated..
/// </summary>
- internal static string ConnectionBroken {
+ public static string ConnectionBroken {
get {
return ResourceManager.GetString("ConnectionBroken", resourceCulture);
}
@@ -185,7 +180,7 @@
/// <summary>
/// Looks up a localized string similar to Connection must be valid and open.
/// </summary>
- internal static string ConnectionMustBeOpen {
+ public static string ConnectionMustBeOpen {
get {
return ResourceManager.GetString("ConnectionMustBeOpen", resourceCulture);
}
@@ -194,16 +189,16 @@
/// <summary>
/// Looks up a localized string similar to The connection is not open..
/// </summary>
- internal static string ConnectionNotOpen {
+ public static string ConnectionNotOpen {
get {
return ResourceManager.GetString("ConnectionNotOpen", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to The connection property has not been set..
+ /// Looks up a localized string similar to The connection property has not been set or is null..
/// </summary>
- internal static string ConnectionNotSet {
+ public static string ConnectionNotSet {
get {
return ResourceManager.GetString("ConnectionNotSet", resourceCulture);
}
@@ -212,7 +207,7 @@
/// <summary>
/// Looks up a localized string similar to Count cannot be negative.
/// </summary>
- internal static string CountCannotBeNegative {
+ public static string CountCannotBeNegative {
get {
return ResourceManager.GetString("CountCannotBeNegative", resourceCulture);
}
@@ -221,7 +216,7 @@
/// <summary>
/// Looks up a localized string similar to SetLength is not a valid operation on CompressedStream.
/// </summary>
- internal static string CSNoSetLength {
+ public static string CSNoSetLength {
get {
return ResourceManager.GetString("CSNoSetLength", resourceCulture);
}
@@ -230,31 +225,61 @@
/// <summary>
/// Looks up a localized string similar to There is already an open DataReader associated with this Connection which must be closed first..
/// </summary>
- internal static string DataReaderOpen {
+ public static string DataReaderOpen {
get {
return ResourceManager.GetString("DataReaderOpen", resourceCulture);
}
}
- internal static string DistributedTxnNotSupported {
+ /// <summary>
+ /// Looks up a localized string similar to MySQL Connector/Net does not currently support distributed transactions..
+ /// </summary>
+ public static string DistributedTxnNotSupported {
get {
return ResourceManager.GetString("DistributedTxnNotSupported", resourceCulture);
}
}
-
+
/// <summary>
/// Looks up a localized string similar to Error creating socket connection.
/// </summary>
- internal static string ErrorCreatingSocket {
+ public static string ErrorCreatingSocket {
get {
return ResourceManager.GetString("ErrorCreatingSocket", resourceCulture);
}
}
/// <summary>
+ /// Looks up a localized string similar to Fatal error encountered during command execution..
+ /// </summary>
+ public static string FatalErrorDuringExecute {
+ get {
+ return ResourceManager.GetString("FatalErrorDuringExecute", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Fatal error encountered during data read..
+ /// </summary>
+ public static string FatalErrorDuringRead {
+ get {
+ return ResourceManager.GetString("FatalErrorDuringRead", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Fatal error encountered attempting to read the resultset..
+ /// </summary>
+ public static string FatalErrorReadingResult {
+ get {
+ return ResourceManager.GetString("FatalErrorReadingResult", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to From index and length use more bytes than from contains.
/// </summary>
- internal static string FromAndLengthTooBig {
+ public static string FromAndLengthTooBig {
get {
return ResourceManager.GetString("FromAndLengthTooBig", resourceCulture);
}
@@ -263,7 +288,7 @@
/// <summary>
/// Looks up a localized string similar to From index must be a valid index inside the from buffer.
/// </summary>
- internal static string FromIndexMustBeValid {
+ public static string FromIndexMustBeValid {
get {
return ResourceManager.GetString("FromIndexMustBeValid", resourceCulture);
}
@@ -272,7 +297,7 @@
/// <summary>
/// Looks up a localized string similar to Retrieving procedure metadata for {0} from server..
/// </summary>
- internal static string HardProcQuery {
+ public static string HardProcQuery {
get {
return ResourceManager.GetString("HardProcQuery", resourceCulture);
}
@@ -281,7 +306,7 @@
/// <summary>
/// Looks up a localized string similar to Value has an unsupported format..
/// </summary>
- internal static string ImproperValueFormat {
+ public static string ImproperValueFormat {
get {
return ResourceManager.GetString("ImproperValueFormat", resourceCulture);
}
@@ -290,7 +315,7 @@
/// <summary>
/// Looks up a localized string similar to An incorrect response was received from the server..
/// </summary>
- internal static string IncorrectTransmission {
+ public static string IncorrectTransmission {
get {
return ResourceManager.GetString("IncorrectTransmission", resourceCulture);
}
@@ -299,7 +324,7 @@
/// <summary>
/// Looks up a localized string similar to Index and length use more bytes than to has room for.
/// </summary>
- internal static string IndexAndLengthTooBig {
+ public static string IndexAndLengthTooBig {
get {
return ResourceManager.GetString("IndexAndLengthTooBig", resourceCulture);
}
@@ -308,7 +333,7 @@
/// <summary>
/// Looks up a localized string similar to Index must be a valid position in the buffer.
/// </summary>
- internal static string IndexMustBeValid {
+ public static string IndexMustBeValid {
get {
return ResourceManager.GetString("IndexMustBeValid", resourceCulture);
}
@@ -317,7 +342,7 @@
/// <summary>
/// Looks up a localized string similar to Procedure or function '{0}' cannot be found in database '{1}'..
/// </summary>
- internal static string InvalidProcName {
+ public static string InvalidProcName {
get {
return ResourceManager.GetString("InvalidProcName", resourceCulture);
}
@@ -326,7 +351,7 @@
/// <summary>
/// Looks up a localized string similar to Keyword does not allow null values..
/// </summary>
- internal static string KeywordNoNull {
+ public static string KeywordNoNull {
get {
return ResourceManager.GetString("KeywordNoNull", resourceCulture);
}
@@ -335,7 +360,7 @@
/// <summary>
/// Looks up a localized string similar to Keyword not supported..
/// </summary>
- internal static string KeywordNotSupported {
+ public static string KeywordNotSupported {
get {
return ResourceManager.GetString("KeywordNotSupported", resourceCulture);
}
@@ -344,23 +369,25 @@
/// <summary>
/// Looks up a localized string similar to When MySqlCommandBuilder.ReturnGeneratedIdentifiers is true, MySqlCommand.UpdatedRowSource must be set to None..
/// </summary>
- internal static string MixingUpdatedRowSource {
+ public static string MixingUpdatedRowSource {
get {
return ResourceManager.GetString("MixingUpdatedRowSource", resourceCulture);
}
}
-
- internal static string MultipleConnectionsInTransactionNotSupported
- {
+
+ /// <summary>
+ /// Looks up a localized string similar to Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported..
+ /// </summary>
+ public static string MultipleConnectionsInTransactionNotSupported {
get {
return ResourceManager.GetString("MultipleConnectionsInTransactionNotSupported", resourceCulture);
}
}
-
+
/// <summary>
/// Looks up a localized string similar to NamedPipeStream does not support seeking.
/// </summary>
- internal static string NamedPipeNoSeek {
+ public static string NamedPipeNoSeek {
get {
return ResourceManager.GetString("NamedPipeNoSeek", resourceCulture);
}
@@ -369,7 +396,7 @@
/// <summary>
/// Looks up a localized string similar to NamedPipeStream doesn't support SetLength.
/// </summary>
- internal static string NamedPipeNoSetLength {
+ public static string NamedPipeNoSetLength {
get {
return ResourceManager.GetString("NamedPipeNoSetLength", resourceCulture);
}
@@ -378,7 +405,7 @@
/// <summary>
/// Looks up a localized string similar to Invalid attempt to call NextResult when the reader is closed..
/// </summary>
- internal static string NextResultIsClosed {
+ public static string NextResultIsClosed {
get {
return ResourceManager.GetString("NextResultIsClosed", resourceCulture);
}
@@ -387,7 +414,7 @@
/// <summary>
/// Looks up a localized string similar to When calling stored procedures and 'Use Procedure Bodies' is false, all parameters must have their type explicitly set..
/// </summary>
- internal static string NoBodiesAndTypeNotSet {
+ public static string NoBodiesAndTypeNotSet {
get {
return ResourceManager.GetString("NoBodiesAndTypeNotSet", resourceCulture);
}
@@ -396,24 +423,25 @@
/// <summary>
/// Looks up a localized string similar to Nested transactions are not supported..
/// </summary>
- internal static string NoNestedTransactions {
+ public static string NoNestedTransactions {
get {
return ResourceManager.GetString("NoNestedTransactions", resourceCulture);
}
}
-
- internal static string ObjectDisposed
- {
- get
- {
+
+ /// <summary>
+ /// Looks up a localized string similar to The object is not open or has been disposed..
+ /// </summary>
+ public static string ObjectDisposed {
+ get {
return ResourceManager.GetString("ObjectDisposed", resourceCulture);
}
}
-
+
/// <summary>
/// Looks up a localized string similar to Offset cannot be negative.
/// </summary>
- internal static string OffsetCannotBeNegative {
+ public static string OffsetCannotBeNegative {
get {
return ResourceManager.GetString("OffsetCannotBeNegative", resourceCulture);
}
@@ -422,7 +450,7 @@
/// <summary>
/// Looks up a localized string similar to Offset must be a valid position in buffer.
/// </summary>
- internal static string OffsetMustBeValid {
+ public static string OffsetMustBeValid {
get {
return ResourceManager.GetString("OffsetMustBeValid", resourceCulture);
}
@@ -431,7 +459,7 @@
/// <summary>
/// Looks up a localized string similar to Parameter '{0}' has already been defined..
/// </summary>
- internal static string ParameterAlreadyDefined {
+ public static string ParameterAlreadyDefined {
get {
return ResourceManager.GetString("ParameterAlreadyDefined", resourceCulture);
}
@@ -440,7 +468,7 @@
/// <summary>
/// Looks up a localized string similar to Parameter cannot have a negative value.
/// </summary>
- internal static string ParameterCannotBeNegative {
+ public static string ParameterCannotBeNegative {
get {
return ResourceManager.GetString("ParameterCannotBeNegative", resourceCulture);
}
@@ -449,7 +477,7 @@
/// <summary>
/// Looks up a localized string similar to Parameter cannot be null.
/// </summary>
- internal static string ParameterCannotBeNull {
+ public static string ParameterCannotBeNull {
get {
return ResourceManager.GetString("ParameterCannotBeNull", resourceCulture);
}
@@ -458,7 +486,7 @@
/// <summary>
/// Looks up a localized string similar to Parameter is invalid..
/// </summary>
- internal static string ParameterIsInvalid {
+ public static string ParameterIsInvalid {
get {
return ResourceManager.GetString("ParameterIsInvalid", resourceCulture);
}
@@ -467,7 +495,7 @@
/// <summary>
/// Looks up a localized string similar to Parameter '{0}' must be defined..
/// </summary>
- internal static string ParameterMustBeDefined {
+ public static string ParameterMustBeDefined {
get {
return ResourceManager.GetString("ParameterMustBeDefined", resourceCulture);
}
@@ -476,7 +504,7 @@
/// <summary>
/// Looks up a localized string similar to Password must be valid and contain length characters.
/// </summary>
- internal static string PasswordMustHaveLegalChars {
+ public static string PasswordMustHaveLegalChars {
get {
return ResourceManager.GetString("PasswordMustHaveLegalChars", resourceCulture);
}
@@ -485,7 +513,7 @@
/// <summary>
/// Looks up a localized string similar to This category includes a series of counters for MySQL..
/// </summary>
- internal static string PerfMonCategoryHelp {
+ public static string PerfMonCategoryHelp {
get {
return ResourceManager.GetString("PerfMonCategoryHelp", resourceCulture);
}
@@ -494,7 +522,7 @@
/// <summary>
/// Looks up a localized string similar to .NET Data Provider for MySQL.
/// </summary>
- internal static string PerfMonCategoryName {
+ public static string PerfMonCategoryName {
get {
return ResourceManager.GetString("PerfMonCategoryName", resourceCulture);
}
@@ -503,7 +531,7 @@
/// <summary>
/// Looks up a localized string similar to The number of times a procedures metadata had to be queried from the server..
/// </summary>
- internal static string PerfMonHardProcHelp {
+ public static string PerfMonHardProcHelp {
get {
return ResourceManager.GetString("PerfMonHardProcHelp", resourceCulture);
}
@@ -512,7 +540,7 @@
/// <summary>
/// Looks up a localized string similar to Hard Procedure Queries.
/// </summary>
- internal static string PerfMonHardProcName {
+ public static string PerfMonHardProcName {
get {
return ResourceManager.GetString("PerfMonHardProcName", resourceCulture);
}
@@ -521,7 +549,7 @@
/// <summary>
/// Looks up a localized string similar to The number of times a procedures metadata was retrieved from the client-side cache..
/// </summary>
- internal static string PerfMonSoftProcHelp {
+ public static string PerfMonSoftProcHelp {
get {
return ResourceManager.GetString("PerfMonSoftProcHelp", resourceCulture);
}
@@ -530,7 +558,7 @@
/// <summary>
/// Looks up a localized string similar to Soft Procedure Queries.
/// </summary>
- internal static string PerfMonSoftProcName {
+ public static string PerfMonSoftProcName {
get {
return ResourceManager.GetString("PerfMonSoftProcName", resourceCulture);
}
@@ -539,7 +567,7 @@
/// <summary>
/// Looks up a localized string similar to same name are not supported..
/// </summary>
- internal static string ProcAndFuncSameName {
+ public static string ProcAndFuncSameName {
get {
return ResourceManager.GetString("ProcAndFuncSameName", resourceCulture);
}
@@ -548,7 +576,7 @@
/// <summary>
/// Looks up a localized string similar to Packets larger than max_allowed_packet are not allowed..
/// </summary>
- internal static string QueryTooLarge {
+ public static string QueryTooLarge {
get {
return ResourceManager.GetString("QueryTooLarge", resourceCulture);
}
@@ -557,7 +585,7 @@
/// <summary>
/// Looks up a localized string similar to Reading from the stream has failed..
/// </summary>
- internal static string ReadFromStreamFailed {
+ public static string ReadFromStreamFailed {
get {
return ResourceManager.GetString("ReadFromStreamFailed", resourceCulture);
}
@@ -566,7 +594,7 @@
/// <summary>
/// Looks up a localized string similar to Socket streams do not support seeking.
/// </summary>
- internal static string SocketNoSeek {
+ public static string SocketNoSeek {
get {
return ResourceManager.GetString("SocketNoSeek", resourceCulture);
}
@@ -575,7 +603,7 @@
/// <summary>
/// Looks up a localized string similar to Retrieving procedure metadata for {0} from procedure cache..
/// </summary>
- internal static string SoftProcQuery {
+ public static string SoftProcQuery {
get {
return ResourceManager.GetString("SoftProcQuery", resourceCulture);
}
@@ -584,7 +612,7 @@
/// <summary>
/// Looks up a localized string similar to Stored procedures are not supported on this version of MySQL.
/// </summary>
- internal static string SPNotSupported {
+ public static string SPNotSupported {
get {
return ResourceManager.GetString("SPNotSupported", resourceCulture);
}
@@ -593,7 +621,7 @@
/// <summary>
/// Looks up a localized string similar to The stream has already been closed.
/// </summary>
- internal static string StreamAlreadyClosed {
+ public static string StreamAlreadyClosed {
get {
return ResourceManager.GetString("StreamAlreadyClosed", resourceCulture);
}
@@ -602,7 +630,7 @@
/// <summary>
/// Looks up a localized string similar to The stream does not support reading.
/// </summary>
- internal static string StreamNoRead {
+ public static string StreamNoRead {
get {
return ResourceManager.GetString("StreamNoRead", resourceCulture);
}
@@ -611,7 +639,7 @@
/// <summary>
/// Looks up a localized string similar to The stream does not support writing.
/// </summary>
- internal static string StreamNoWrite {
+ public static string StreamNoWrite {
get {
return ResourceManager.GetString("StreamNoWrite", resourceCulture);
}
@@ -620,7 +648,7 @@
/// <summary>
/// Looks up a localized string similar to Timeout expired. The timeout period elapsed prior to completion of the operation or the server is not responding..
/// </summary>
- internal static string Timeout {
+ public static string Timeout {
get {
return ResourceManager.GetString("Timeout", resourceCulture);
}
@@ -629,7 +657,7 @@
/// <summary>
/// Looks up a localized string similar to error connecting: Timeout expired. The timeout period elapsed prior to obtaining a connection from the pool. This may have occurred because all pooled connections were in use and max pool size was reached..
/// </summary>
- internal static string TimeoutGettingConnection {
+ public static string TimeoutGettingConnection {
get {
return ResourceManager.GetString("TimeoutGettingConnection", resourceCulture);
}
@@ -638,7 +666,7 @@
/// <summary>
/// Looks up a localized string similar to Unable to connect to any of the specified MySQL hosts..
/// </summary>
- internal static string UnableToConnectToHost {
+ public static string UnableToConnectToHost {
get {
return ResourceManager.GetString("UnableToConnectToHost", resourceCulture);
}
@@ -647,7 +675,7 @@
/// <summary>
/// Looks up a localized string similar to Unable to execute stored procedure '{0}'..
/// </summary>
- internal static string UnableToExecuteSP {
+ public static string UnableToExecuteSP {
get {
return ResourceManager.GetString("UnableToExecuteSP", resourceCulture);
}
@@ -656,16 +684,16 @@
/// <summary>
/// Looks up a localized string similar to There was an error parsing the foreign key definition..
/// </summary>
- internal static string UnableToParseFK {
+ public static string UnableToParseFK {
get {
return ResourceManager.GetString("UnableToParseFK", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Unable to retrieve stored procedure metadata. Either grant SELECTprivilege to mysql.proc for this user or use "use procedure bodies=false" with your connection string..
+ /// Looks up a localized string similar to Unable to retrieve stored procedure metadata. Either grant SELECT privilege to mysql.proc for this user or use "use procedure bodies=false" with your connection string..
/// </summary>
- internal static string UnableToRetrieveSProcData {
+ public static string UnableToRetrieveSProcData {
get {
return ResourceManager.GetString("UnableToRetrieveSProcData", resourceCulture);
}
@@ -674,7 +702,7 @@
/// <summary>
/// Looks up a localized string similar to Unix sockets are not supported on Windows.
/// </summary>
- internal static string UnixSocketsNotSupported {
+ public static string UnixSocketsNotSupported {
get {
return ResourceManager.GetString("UnixSocketsNotSupported", resourceCulture);
}
@@ -683,7 +711,7 @@
/// <summary>
/// Looks up a localized string similar to Writing to the stream failed..
/// </summary>
- internal static string WriteToStreamFailed {
+ public static string WriteToStreamFailed {
get {
return ResourceManager.GetString("WriteToStreamFailed", resourceCulture);
}
@@ -692,7 +720,7 @@
/// <summary>
/// Looks up a localized string similar to Parameter '{0}' is not found but a parameter with the name '{1}' is found. Parameter names must include the leading parameter marker..
/// </summary>
- internal static string WrongParameterName {
+ public static string WrongParameterName {
get {
return ResourceManager.GetString("WrongParameterName", resourceCulture);
}
Modified: branches/5.2/MySql.Data/Provider/Properties/Resources.resx
===================================================================
--- branches/5.2/MySql.Data/Provider/Properties/Resources.resx 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Properties/Resources.resx 2008-07-18 20:51:08 UTC (rev 1345)
@@ -330,4 +330,13 @@
<data name="DistributedTxnNotSupported" xml:space="preserve">
<value>MySQL Connector/Net does not currently support distributed transactions.</value>
</data>
+ <data name="FatalErrorDuringExecute" xml:space="preserve">
+ <value>Fatal error encountered during command execution.</value>
+ </data>
+ <data name="FatalErrorDuringRead" xml:space="preserve">
+ <value>Fatal error encountered during data read.</value>
+ </data>
+ <data name="FatalErrorReadingResult" xml:space="preserve">
+ <value>Fatal error encountered attempting to read the resultset.</value>
+ </data>
</root>
\ No newline at end of file
Modified: branches/5.2/MySql.Data/Provider/Source/BulkLoader.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/BulkLoader.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/BulkLoader.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -23,6 +23,7 @@
using System.IO;
using System.Data;
using System.Collections.Specialized;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
/// <summary>
Modified: branches/5.2/MySql.Data/Provider/Source/CommandBuilder.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/CommandBuilder.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/CommandBuilder.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -27,6 +27,7 @@
using System.Collections;
using MySql.Data.Types;
using System.Globalization;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/CompressedStream.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/CompressedStream.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/CompressedStream.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -21,6 +21,7 @@
using System;
using System.IO;
using zlib;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/Connection.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Connection.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/Connection.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -31,6 +31,7 @@
using IsolationLevel=System.Data.IsolationLevel;
using MySql.Data.Common;
using System.Diagnostics;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/Crypt.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Crypt.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/Crypt.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -22,6 +22,7 @@
using System.Globalization;
using System.Text;
using MySql.Data.Common;
+using MySql.Data.MySqlClient.Properties;
//using System.Security.Cryptography;
//#if CF
//using OpenNETCF.Security.Cryptography;
Modified: branches/5.2/MySql.Data/Provider/Source/ISSchemaProvider.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/ISSchemaProvider.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/ISSchemaProvider.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -27,6 +27,7 @@
using System.Data.SqlTypes;
using MySql.Data.Types;
using System.Collections;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -25,6 +25,7 @@
using System.Globalization;
using System.Text;
using System.Text.RegularExpressions;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/MySqlPool.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/MySqlPool.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/MySqlPool.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -23,6 +23,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/MySqlScript.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/MySqlScript.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/MySqlScript.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -25,6 +25,7 @@
using System.Data;
using System.Globalization;
using System.IO;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
/// <summary>
Modified: branches/5.2/MySql.Data/Provider/Source/MySqlStream.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/MySqlStream.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/MySqlStream.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -23,6 +23,7 @@
using System.Diagnostics;
using System.Text;
using MySql.Data.Common;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -25,6 +25,7 @@
using MySql.Data.Common;
using MySql.Data.Types;
using System.Security.Cryptography.X509Certificates;
+using MySql.Data.MySqlClient.Properties;
#if !CF
using System.Net.Security;
using System.Security.Authentication;
Modified: branches/5.2/MySql.Data/Provider/Source/PerformanceMonitor.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/PerformanceMonitor.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/PerformanceMonitor.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -20,6 +20,7 @@
using System;
using System.Diagnostics;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/ProcedureCache.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/ProcedureCache.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/ProcedureCache.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -23,6 +23,7 @@
using System.Data;
#if NET20
using System.Collections.Generic;
+using MySql.Data.MySqlClient.Properties;
#endif
namespace MySql.Data.MySqlClient
Modified: branches/5.2/MySql.Data/Provider/Source/Statement.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Statement.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/Statement.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -24,6 +24,7 @@
using System.Text;
using MySql.Data.Common;
using System.Data;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/StoredProcedure.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/StoredProcedure.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/StoredProcedure.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -23,6 +23,7 @@
using System.Globalization;
using System.Text;
using MySql.Data.Types;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Provider/Source/cf/BufferedStream.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/cf/BufferedStream.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/cf/BufferedStream.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -21,6 +21,7 @@
using System;
using System.IO;
using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.Common
{
Modified: branches/5.2/MySql.Data/Provider/Source/command.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/command.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/command.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -30,6 +30,7 @@
using System.Diagnostics;
using System.Globalization;
using System.Collections.Generic;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
@@ -431,7 +432,7 @@
}
if (ex.IsFatal)
Connection.Close();
- throw;
+ throw new MySqlException(Resources.FatalErrorDuringExecute, ex);
}
finally
{
Modified: branches/5.2/MySql.Data/Provider/Source/common/NamedPipeStream.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/common/NamedPipeStream.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/common/NamedPipeStream.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -21,6 +21,7 @@
using System;
using System.IO;
using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.Common
Modified: branches/5.2/MySql.Data/Provider/Source/common/Version.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/common/Version.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/common/Version.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -20,6 +20,7 @@
using System;
using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.Common
{
Modified: branches/5.2/MySql.Data/Provider/Source/datareader.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/datareader.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/datareader.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -26,6 +26,7 @@
using System.Data.SqlTypes;
using System.Collections.Generic;
using System.Globalization;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
@@ -880,8 +881,8 @@
hasRows = canRead = false;
if (command.TimedOut)
throw new MySqlException(Resources.Timeout);
- throw;
- }
+ throw new MySqlException(Resources.FatalErrorReadingResult, ex);
+ }
}
@@ -928,7 +929,7 @@
return false;
}
- throw;
+ throw new MySqlException(Resources.FatalErrorDuringRead, ex);
}
}
Modified: branches/5.2/MySql.Data/Provider/Source/parameter_collection.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/parameter_collection.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Provider/Source/parameter_collection.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -22,6 +22,7 @@
using System.Data.Common;
using System.Collections;
using System.ComponentModel;
+using MySql.Data.MySqlClient.Properties;
namespace MySql.Data.MySqlClient
{
Modified: branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs 2008-07-11 23:14:28 UTC (rev 1344)
+++ branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs 2008-07-18 20:51:08 UTC (rev 1345)
@@ -93,7 +93,11 @@
cmd.CommandText = "SELECT now()";
cmd.ExecuteScalar();
}
- catch (Exception) { }
+ catch (Exception ex)
+ {
+ Assert.IsTrue(ex.Message.StartsWith("Fatal"));
+ }
+
Assert.AreEqual(1, stateChangeCount);
Assert.AreEqual(ConnectionState.Closed, c.State);
| Thread |
|---|
| • Connector/NET commit: r1345 - in branches/5.2: . MySql.Data/Provider MySql.Data/Provider/Properties MySql.Data/Provider/Source MySql.Data/Provider/Sou... | rburnett | 18 Jul |
