Modified:
branches/6.0/CHANGES
branches/6.0/MySql.Data/Provider/MySql.Data.csproj
branches/6.0/MySql.Data/Provider/Properties/Resources.resx
branches/6.0/MySql.Data/Provider/Source/CharSetMap.cs
branches/6.0/MySql.Data/Provider/Source/MySqlPool.cs
branches/6.0/MySql.Data/Provider/Source/MySqlPoolManager.cs
branches/6.0/MySql.Data/Provider/Source/ProcedureCache.cs
branches/6.0/MySql.Data/Provider/Source/common/NamedPipeStream.cs
branches/6.0/MySql.Data/Provider/Source/common/SharedMemoryStream.cs
branches/6.0/MySql.Data/Provider/Source/common/StreamCreator.cs
branches/6.0/MySql.Data/Provider/Source/parameter_collection.cs
branches/6.0/MySql.VisualStudio/DDEX/MySqlDataViewSupport.xml
Log:
merged
Modified: branches/6.0/CHANGES
===================================================================
--- branches/6.0/CHANGES 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/CHANGES 2009-06-08 16:01:39 UTC (rev 1636)
@@ -63,6 +63,9 @@
packet is fully read (bug #43678)
- fixed ReservedWords schema collection to not incorrectly include blank words and to use the
right column name
+- fixed display of trigger names
+- restructured the connection open error handling so that socket exceptions come through
+ as the inner exception (bug #45021)
Version 5.2.6
- cleaned up how stored procedure execution operated when the user does or does not have execute privs
Modified: branches/6.0/MySql.Data/Provider/MySql.Data.csproj
===================================================================
--- branches/6.0/MySql.Data/Provider/MySql.Data.csproj 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/MySql.Data.csproj 2009-06-08 16:01:39 UTC (rev 1636)
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>10.0.20506</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,6 +29,7 @@
<SignAssembly>false</SignAssembly>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -41,7 +42,6 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
@@ -251,9 +251,28 @@
<None Include="..\..\CHANGES">
<Link>CHANGES</Link>
</None>
- <None Include="Migrated rules for MySql.Data.ruleset" />
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
Modified: branches/6.0/MySql.Data/Provider/Properties/Resources.resx
===================================================================
--- branches/6.0/MySql.Data/Provider/Properties/Resources.resx 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Properties/Resources.resx 2009-06-08 16:01:39 UTC (rev 1636)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
+ <!--
Microsoft ResX Schema
Version 2.0
@@ -59,299 +59,288 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="BadVersionFormat" xml:space="preserve">
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="type" type="xsd:string"/>
+ <xsd:attribute name="mimetype" type="xsd:string"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <data name="BadVersionFormat" xml:space="preserve">
<value>Version string not in acceptable format</value>
</data>
- <data name="NamedPipeNoSeek" xml:space="preserve">
+ <data name="NamedPipeNoSeek" xml:space="preserve">
<value>NamedPipeStream does not support seeking</value>
</data>
- <data name="StreamAlreadyClosed" xml:space="preserve">
+ <data name="StreamAlreadyClosed" xml:space="preserve">
<value>The stream has already been closed</value>
</data>
- <data name="BufferCannotBeNull" xml:space="preserve">
+ <data name="BufferCannotBeNull" xml:space="preserve">
<value> The buffer cannot be null</value>
</data>
- <data name="BufferNotLargeEnough" xml:space="preserve">
+ <data name="BufferNotLargeEnough" xml:space="preserve">
<value> Buffer is not large enough</value>
</data>
- <data name="OffsetCannotBeNegative" xml:space="preserve">
+ <data name="OffsetCannotBeNegative" xml:space="preserve">
<value> Offset cannot be negative</value>
</data>
- <data name="CountCannotBeNegative" xml:space="preserve">
+ <data name="CountCannotBeNegative" xml:space="preserve">
<value> Count cannot be negative</value>
</data>
- <data name="StreamNoRead" xml:space="preserve">
+ <data name="StreamNoRead" xml:space="preserve">
<value> The stream does not support reading</value>
</data>
- <data name="NamedPipeNoSetLength" xml:space="preserve">
+ <data name="NamedPipeNoSetLength" xml:space="preserve">
<value>NamedPipeStream doesn't support SetLength</value>
</data>
- <data name="StreamNoWrite" xml:space="preserve">
+ <data name="StreamNoWrite" xml:space="preserve">
<value>The stream does not support writing</value>
</data>
- <data name="ErrorCreatingSocket" xml:space="preserve">
+ <data name="ErrorCreatingSocket" xml:space="preserve">
<value>Error creating socket connection</value>
</data>
- <data name="SocketNoSeek" xml:space="preserve">
+ <data name="SocketNoSeek" xml:space="preserve">
<value>Socket streams do not support seeking</value>
</data>
- <data name="UnixSocketsNotSupported" xml:space="preserve">
+ <data name="UnixSocketsNotSupported" xml:space="preserve">
<value>Unix sockets are not supported on Windows</value>
</data>
- <data name="OffsetMustBeValid" xml:space="preserve">
+ <data name="OffsetMustBeValid" xml:space="preserve">
<value>Offset must be a valid position in buffer</value>
</data>
- <data name="CSNoSetLength" xml:space="preserve">
+ <data name="CSNoSetLength" xml:space="preserve">
<value>SetLength is not a valid operation on CompressedStream</value>
</data>
- <data name="FromIndexMustBeValid" xml:space="preserve">
+ <data name="FromIndexMustBeValid" xml:space="preserve">
<value>From index must be a valid index inside the from buffer</value>
</data>
- <data name="FromAndLengthTooBig" xml:space="preserve">
+ <data name="FromAndLengthTooBig" xml:space="preserve">
<value>From index and length use more bytes than from contains</value>
</data>
- <data name="IndexMustBeValid" xml:space="preserve">
+ <data name="IndexMustBeValid" xml:space="preserve">
<value>Index must be a valid position in the buffer</value>
</data>
- <data name="IndexAndLengthTooBig" xml:space="preserve">
+ <data name="IndexAndLengthTooBig" xml:space="preserve">
<value>Index and length use more bytes than to has room for</value>
</data>
- <data name="PasswordMustHaveLegalChars" xml:space="preserve">
+ <data name="PasswordMustHaveLegalChars" xml:space="preserve">
<value>Password must be valid and contain length characters</value>
</data>
- <data name="ParameterCannotBeNegative" xml:space="preserve">
+ <data name="ParameterCannotBeNegative" xml:space="preserve">
<value>Parameter cannot have a negative value</value>
</data>
- <data name="ConnectionMustBeOpen" xml:space="preserve">
+ <data name="ConnectionMustBeOpen" xml:space="preserve">
<value>Connection must be valid and open</value>
</data>
- <data name="DataReaderOpen" xml:space="preserve">
+ <data name="DataReaderOpen" xml:space="preserve">
<value>There is already an open DataReader associated with this Connection which must be closed first.</value>
</data>
- <data name="SPNotSupported" xml:space="preserve">
+ <data name="SPNotSupported" xml:space="preserve">
<value>Stored procedures are not supported on this version of MySQL</value>
</data>
- <data name="ConnectionNotSet" xml:space="preserve">
+ <data name="ConnectionNotSet" xml:space="preserve">
<value>The connection property has not been set or is null.</value>
</data>
- <data name="ConnectionNotOpen" xml:space="preserve">
+ <data name="ConnectionNotOpen" xml:space="preserve">
<value>The connection is not open.</value>
</data>
- <data name="AdapterIsNull" xml:space="preserve">
+ <data name="AdapterIsNull" xml:space="preserve">
<value>Improper MySqlCommandBuilder state: adapter is null</value>
</data>
- <data name="AdapterSelectIsNull" xml:space="preserve">
+ <data name="AdapterSelectIsNull" xml:space="preserve">
<value>Improper MySqlCommandBuilder state: adapter's SelectCommand is null</value>
</data>
- <data name="CBMultiTableNotSupported" xml:space="preserve">
+ <data name="CBMultiTableNotSupported" xml:space="preserve">
<value>MySqlCommandBuilder does not support multi-table statements</value>
</data>
- <data name="CBNoKeyColumn" xml:space="preserve">
+ <data name="CBNoKeyColumn" xml:space="preserve">
<value>MySqlCommandBuilder cannot operate on tables with no unique or key columns</value>
</data>
- <data name="ParameterCannotBeNull" xml:space="preserve">
+ <data name="ParameterCannotBeNull" xml:space="preserve">
<value>Parameter cannot be null</value>
</data>
- <data name="ChaosNotSupported" xml:space="preserve">
+ <data name="ChaosNotSupported" xml:space="preserve">
<value>Chaos isolation level is not supported</value>
</data>
- <data name="ParameterIsInvalid" xml:space="preserve">
+ <data name="ParameterIsInvalid" xml:space="preserve">
<value>Parameter is invalid.</value>
</data>
- <data name="ConnectionAlreadyOpen" xml:space="preserve">
+ <data name="ConnectionAlreadyOpen" xml:space="preserve">
<value>The connection is already open.</value>
</data>
- <data name="KeywordNotSupported" xml:space="preserve">
+ <data name="KeywordNotSupported" xml:space="preserve">
<value>Keyword not supported.</value>
</data>
- <data name="WriteToStreamFailed" xml:space="preserve">
+ <data name="WriteToStreamFailed" xml:space="preserve">
<value>Writing to the stream failed.</value>
</data>
- <data name="ReadFromStreamFailed" xml:space="preserve">
+ <data name="ReadFromStreamFailed" xml:space="preserve">
<value>Reading from the stream has failed.</value>
</data>
- <data name="QueryTooLarge" xml:space="preserve">
+ <data name="QueryTooLarge" xml:space="preserve">
<value>Packets larger than max_allowed_packet are not allowed.</value>
</data>
- <data name="UnableToExecuteSP" xml:space="preserve">
+ <data name="UnableToExecuteSP" xml:space="preserve">
<value>Unable to execute stored procedure '{0}'.</value>
</data>
- <data name="ProcAndFuncSameName" xml:space="preserve">
+ <data name="ProcAndFuncSameName" xml:space="preserve">
<value>same name are not supported.</value>
</data>
- <data name="KeywordNoNull" xml:space="preserve">
+ <data name="KeywordNoNull" xml:space="preserve">
<value>Keyword does not allow null values.</value>
</data>
- <data name="ImproperValueFormat" xml:space="preserve">
+ <data name="ImproperValueFormat" xml:space="preserve">
<value>Value has an unsupported format.</value>
</data>
- <data name="InvalidProcName" xml:space="preserve">
+ <data name="InvalidProcName" xml:space="preserve">
<value>Procedure or function '{0}' cannot be found in database '{1}'.</value>
</data>
- <data name="HardProcQuery" xml:space="preserve">
+ <data name="HardProcQuery" xml:space="preserve">
<value>Retrieving procedure metadata for {0} from server.</value>
</data>
- <data name="SoftProcQuery" xml:space="preserve">
+ <data name="SoftProcQuery" xml:space="preserve">
<value>Retrieving procedure metadata for {0} from procedure cache.</value>
</data>
- <data name="ConnectionBroken" xml:space="preserve">
+ <data name="ConnectionBroken" xml:space="preserve">
<value>Connection unexpectedly terminated.</value>
</data>
- <data name="IncorrectTransmission" xml:space="preserve">
+ <data name="IncorrectTransmission" xml:space="preserve">
<value>An incorrect response was received from the server.</value>
</data>
- <data name="CancelNotSupported" xml:space="preserve">
+ <data name="CancelNotSupported" xml:space="preserve">
<value>Canceling an active query is only supported on MySQL 5.0.0 and above. </value>
</data>
- <data name="Timeout" xml:space="preserve">
+ <data name="Timeout" xml:space="preserve">
<value>Timeout expired. The timeout period elapsed prior to completion of the operation or the server is not responding.</value>
</data>
- <data name="CancelNeeds50" xml:space="preserve">
+ <data name="CancelNeeds50" xml:space="preserve">
<value>Canceling an executing query requires MySQL 5.0 or higher.</value>
</data>
- <data name="NoNestedTransactions" xml:space="preserve">
+ <data name="NoNestedTransactions" xml:space="preserve">
<value>Nested transactions are not supported.</value>
</data>
- <data name="CommandTextNotInitialized" xml:space="preserve">
+ <data name="CommandTextNotInitialized" xml:space="preserve">
<value>The CommandText property has not been properly initialized.</value>
</data>
- <data name="UnableToParseFK" xml:space="preserve">
+ <data name="UnableToParseFK" xml:space="preserve">
<value>There was an error parsing the foreign key definition.</value>
</data>
- <data name="PerfMonCategoryHelp" xml:space="preserve">
+ <data name="PerfMonCategoryHelp" xml:space="preserve">
<value>This category includes a series of counters for MySQL.</value>
</data>
- <data name="PerfMonCategoryName" xml:space="preserve">
+ <data name="PerfMonCategoryName" xml:space="preserve">
<value>.NET Data Provider for MySQL</value>
</data>
- <data name="PerfMonHardProcHelp" xml:space="preserve">
+ <data name="PerfMonHardProcHelp" xml:space="preserve">
<value>The number of times a procedures metadata had to be queried from the server.</value>
</data>
- <data name="PerfMonHardProcName" xml:space="preserve">
+ <data name="PerfMonHardProcName" xml:space="preserve">
<value>Hard Procedure Queries</value>
</data>
- <data name="PerfMonSoftProcHelp" xml:space="preserve">
+ <data name="PerfMonSoftProcHelp" xml:space="preserve">
<value>The number of times a procedures metadata was retrieved from the client-side cache.</value>
</data>
- <data name="PerfMonSoftProcName" xml:space="preserve">
+ <data name="PerfMonSoftProcName" xml:space="preserve">
<value>Soft Procedure Queries</value>
</data>
- <data name="WrongParameterName" xml:space="preserve">
+ <data name="WrongParameterName" xml:space="preserve">
<value>Parameter '{0}' is not found but a parameter with the name '{1}' is found. Parameter names must include the leading parameter marker.</value>
</data>
- <data name="UnableToConnectToHost" xml:space="preserve">
+ <data name="UnableToConnectToHost" xml:space="preserve">
<value>Unable to connect to any of the specified MySQL hosts.</value>
</data>
- <data name="UnableToRetrieveSProcData" xml:space="preserve">
+ <data name="UnableToRetrieveSProcData" xml:space="preserve">
<value>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.</value>
</data>
- <data name="NextResultIsClosed" xml:space="preserve">
+ <data name="NextResultIsClosed" xml:space="preserve">
<value>Invalid attempt to call NextResult when the reader is closed.</value>
</data>
- <data name="NoBodiesAndTypeNotSet" xml:space="preserve">
+ <data name="NoBodiesAndTypeNotSet" xml:space="preserve">
<value>When calling stored procedures and 'Use Procedure Bodies' is false, all parameters must have their type explicitly set.</value>
</data>
- <data name="TimeoutGettingConnection" xml:space="preserve">
+ <data name="TimeoutGettingConnection" xml:space="preserve">
<value>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.</value>
</data>
- <data name="ParameterAlreadyDefined" xml:space="preserve">
+ <data name="ParameterAlreadyDefined" xml:space="preserve">
<value>Parameter '{0}' has already been defined.</value>
</data>
- <data name="ParameterMustBeDefined" xml:space="preserve">
+ <data name="ParameterMustBeDefined" xml:space="preserve">
<value>Parameter '{0}' must be defined.</value>
</data>
- <data name="MixingUpdatedRowSource" xml:space="preserve">
+ <data name="MixingUpdatedRowSource" xml:space="preserve">
<value>When MySqlCommandBuilder.ReturnGeneratedIdentifiers is true, MySqlCommand.UpdatedRowSource must be set to None.</value>
</data>
- <data name="ObjectDisposed" xml:space="preserve">
+ <data name="ObjectDisposed" xml:space="preserve">
<value>The object is not open or has been disposed.</value>
</data>
- <data name="MultipleConnectionsInTransactionNotSupported" xml:space="preserve">
+ <data name="MultipleConnectionsInTransactionNotSupported" xml:space="preserve">
<value>Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported.</value>
</data>
- <data name="DistributedTxnNotSupported" xml:space="preserve">
+ <data name="DistributedTxnNotSupported" xml:space="preserve">
<value>MySQL Connector/Net does not currently support distributed transactions.</value>
</data>
- <data name="FatalErrorDuringExecute" xml:space="preserve">
+ <data name="FatalErrorDuringExecute" xml:space="preserve">
<value>Fatal error encountered during command execution.</value>
</data>
- <data name="FatalErrorDuringRead" xml:space="preserve">
+ <data name="FatalErrorDuringRead" xml:space="preserve">
<value>Fatal error encountered during data read.</value>
</data>
- <data name="FatalErrorReadingResult" xml:space="preserve">
+ <data name="FatalErrorReadingResult" xml:space="preserve">
<value>Fatal error encountered attempting to read the resultset.</value>
</data>
- <data name="RoutineNotFound" xml:space="preserve"> <value>Routine '{0}' cannot be found. Either check the spelling or make sure you have sufficient rights to execute the routine.</value> </data> <data name="ParameterNotFoundDuringPrepare" xml:space="preserve">
+ <data name="RoutineNotFound" xml:space="preserve"> <value>Routine '{0}' cannot be found. Either check the spelling or make sure you have sufficient rights to execute the routine.</value> </data>
+ <data name="ParameterNotFoundDuringPrepare" xml:space="preserve">
<value>Parameter '{0}' was not found during prepare.</value>
</data>
- <data name="ValueNotSupportedForGuid" xml:space="preserve">
+ <data name="ValueNotSupportedForGuid" xml:space="preserve">
<value>The requested column value could not be treated as or conveted to a Guid.</value>
</data>
- <data name="UnableToRetrieveParameters" xml:space="preserve">
+ <data name="UnableToRetrieveParameters" xml:space="preserve">
<value>Unable to retrieve stored routine parameters. Either grant access to the routine or add the 'Use Procedure Bodies=false' option to your connection string.</value>
</data>
- <data name="UnableToEnumerateUDF" xml:space="preserve">
+ <data name="UnableToEnumerateUDF" xml:space="preserve">
<value>An error occured attempting to enumerate the user-defined functions. Do you have SELECT privileges on the mysql.func table?</value>
</data>
- <data name="DataNotInSupportedFormat" xml:space="preserve">
+ <data name="DataNotInSupportedFormat" xml:space="preserve">
<value>The given value was not in a supported format.</value>
</data>
-</root>
\ No newline at end of file
+ <resheader name="resmimetype"><value>text/microsoft-resx</value></resheader><resheader name="version"><value>2.0</value></resheader><resheader name="reader"><value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader><resheader name="writer"><value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader></root>
Modified: branches/6.0/MySql.Data/Provider/Source/CharSetMap.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/CharSetMap.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/CharSetMap.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -22,10 +22,8 @@
using System.Collections;
using System.Text;
using MySql.Data.Common;
-#if NET20
using System.Collections.Generic;
using System.Data;
-#endif
namespace MySql.Data.MySqlClient
{
@@ -34,14 +32,10 @@
/// </summary>
internal class CharSetMap
{
-#if NET20
private static Dictionary<string, string> defaultCollations;
private static Dictionary<string, int> maxLengths;
private static Dictionary<string, CharacterSet> mapping;
private static object lockObject;
-#else
- private static Hashtable mapping;
-#endif
// we use a static constructor here since we only want to init
// the mapping once
@@ -88,11 +82,7 @@
private static void LoadCharsetMap()
{
-#if NET20
mapping = new Dictionary<string, CharacterSet>();
-#else
- mapping = new Hashtable();
-#endif
mapping.Add("latin1", new CharacterSet("latin1", 1));
mapping.Add("big5", new CharacterSet("big5", 2));
Modified: branches/6.0/MySql.Data/Provider/Source/MySqlPool.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/MySqlPool.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/MySqlPool.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -32,13 +32,8 @@
/// </summary>
internal sealed class MySqlPool
{
-#if NET20
private List<Driver> inUsePool;
private Queue<Driver> idlePool;
-#else
- private ArrayList inUsePool;
- private Queue idlePool;
-#endif
private MySqlConnectionStringBuilder settings;
private uint minSize;
private uint maxSize;
@@ -58,13 +53,8 @@
if (minSize > maxSize)
minSize = maxSize;
this.settings = settings;
-#if NET20
inUsePool = new List<Driver>((int)maxSize);
idlePool = new Queue<Driver>((int)maxSize);
-#else
- inUsePool =new ArrayList((int)maxSize);
- idlePool = new Queue((int)maxSize);
-#endif
// prepopulate the idle pool to minSize
for (int i = 0; i < minSize; i++)
Modified: branches/6.0/MySql.Data/Provider/Source/MySqlPoolManager.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/MySqlPoolManager.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/MySqlPoolManager.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -30,11 +30,7 @@
internal class MySqlPoolManager
{
private static Hashtable pools = new Hashtable();
-#if NET20
private static List<MySqlPool> clearingPools = new List<MySqlPool>();
-#else
- private static ArrayList clearingPools = new ArrayList();
-#endif
public static MySqlPool GetPool(MySqlConnectionStringBuilder settings)
{
Modified: branches/6.0/MySql.Data/Provider/Source/ProcedureCache.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/ProcedureCache.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/ProcedureCache.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -21,31 +21,21 @@
using System;
using System.Collections;
using System.Data;
-#if NET20
using System.Collections.Generic;
using MySql.Data.MySqlClient.Properties;
-#endif
namespace MySql.Data.MySqlClient
{
internal class ProcedureCache
{
private Hashtable procHash;
-#if NET20
private Queue<int> hashQueue;
-#else
- private Queue hashQueue;
-#endif
private int maxSize;
public ProcedureCache(int size)
{
maxSize = size;
-#if NET20
hashQueue = new Queue<int>(maxSize);
-#else
- hashQueue = new Queue(maxSize);
-#endif
procHash = new Hashtable(maxSize);
}
@@ -102,11 +92,7 @@
private void TrimHash()
{
-#if NET20
int oldestHash = hashQueue.Dequeue();
-#else
- int oldestHash = (int) hashQueue.Dequeue();
-#endif
procHash.Remove(oldestHash);
}
Modified: branches/6.0/MySql.Data/Provider/Source/common/NamedPipeStream.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/common/NamedPipeStream.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/common/NamedPipeStream.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -31,7 +31,6 @@
/// </summary>
internal class NamedPipeStream : Stream
{
-
int pipeHandle;
FileAccess _mode;
@@ -191,6 +190,16 @@
{
throw new NotSupportedException(Resources.NamedPipeNoSeek);
}
+
+ internal static NamedPipeStream Create(string pipeName, string hostname)
+ {
+ string pipePath;
+ if (0 == String.Compare(hostname, "localhost", true))
+ pipePath = @"\\.\pipe\" + pipeName;
+ else
+ pipePath = String.Format(@"\\{0}\pipe\{1}", hostname, pipeName);
+ return new NamedPipeStream(pipePath, FileAccess.ReadWrite);
+ }
}
}
Modified: branches/6.0/MySql.Data/Provider/Source/common/SharedMemoryStream.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/common/SharedMemoryStream.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/common/SharedMemoryStream.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -74,20 +74,12 @@
AutoResetEvent connectRequest = new AutoResetEvent(false);
IntPtr handle = NativeMethods.OpenEvent(SYNCHRONIZE | EVENT_MODIFY_STATE, false,
memoryName + "_" + "CONNECT_REQUEST");
-#if NET20
connectRequest.SafeWaitHandle = new SafeWaitHandle(handle, true);
-#else
- connectRequest.Handle = handle;
-#endif
AutoResetEvent connectAnswer = new AutoResetEvent(false);
handle = NativeMethods.OpenEvent(SYNCHRONIZE | EVENT_MODIFY_STATE, false,
memoryName + "_" + "CONNECT_ANSWER");
-#if NET20
connectAnswer.SafeWaitHandle = new SafeWaitHandle(handle, true);
-#else
- connectAnswer.Handle = handle;
-#endif
IntPtr connectFileMap = NativeMethods.OpenFileMapping(FILE_MAP_WRITE, false,
memoryName + "_" + "CONNECT_DATA");
@@ -115,41 +107,25 @@
IntPtr handle = NativeMethods.OpenEvent(SYNCHRONIZE | EVENT_MODIFY_STATE, false,
dataMemoryName + "_SERVER_WROTE");
Debug.Assert(handle != IntPtr.Zero);
-#if NET20
serverWrote.SafeWaitHandle = new SafeWaitHandle(handle, true);
-#else
- serverWrote.Handle = handle;
-#endif
serverRead = new AutoResetEvent(false);
handle = NativeMethods.OpenEvent(SYNCHRONIZE | EVENT_MODIFY_STATE, false,
dataMemoryName + "_SERVER_READ");
Debug.Assert(handle != IntPtr.Zero);
-#if NET20
serverRead.SafeWaitHandle = new SafeWaitHandle(handle, true);
-#else
- serverRead.Handle = handle;
-#endif
clientWrote = new AutoResetEvent(false);
handle = NativeMethods.OpenEvent(SYNCHRONIZE | EVENT_MODIFY_STATE, false,
dataMemoryName + "_CLIENT_WROTE");
Debug.Assert(handle != IntPtr.Zero);
-#if NET20
clientWrote.SafeWaitHandle = new SafeWaitHandle(handle, true);
-#else
- clientWrote.Handle = handle;
-#endif
clientRead = new AutoResetEvent(false);
handle = NativeMethods.OpenEvent(SYNCHRONIZE | EVENT_MODIFY_STATE, false,
dataMemoryName + "_CLIENT_READ");
Debug.Assert(handle != IntPtr.Zero);
-#if NET20
clientRead.SafeWaitHandle = new SafeWaitHandle(handle, true);
-#else
- clientRead.Handle = handle;
-#endif
// tell the server we are ready
serverRead.Set();
Modified: branches/6.0/MySql.Data/Provider/Source/common/StreamCreator.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/common/StreamCreator.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/common/StreamCreator.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -62,35 +62,39 @@
while (pos < dnsHosts.Length)
{
+ try
+ {
+ if (usePipe)
+ {
#if !CF
- if (usePipe)
- stream = CreateNamedPipeStream(dnsHosts[index]);
- else
+ stream = NamedPipeStream.Create(pipeName, dnsHosts[index]);
#endif
- {
-#if NET20
- IPHostEntry ipHE = GetHostEntry(dnsHosts[index]);
-#else
- IPHostEntry ipHE = Dns.GetHostByName(dnsHosts[index]);
-#endif
-
- foreach (IPAddress address in ipHE.AddressList)
+ }
+ else
{
- // MySQL doesn't currently support IPv6 addresses
- if (address.AddressFamily == AddressFamily.InterNetworkV6)
- continue;
-
- stream = CreateSocketStream(address, false);
- if (stream != null)
- break;
+ IPHostEntry ipHE = GetHostEntry(dnsHosts[index]);
+ foreach (IPAddress address in ipHE.AddressList)
+ {
+ // MySQL doesn't currently support IPv6 addresses
+ if (address.AddressFamily == AddressFamily.InterNetworkV6)
+ continue;
+ stream = CreateSocketStream(address, false);
+ if (stream != null) break;
+ }
}
+ if (stream != null)
+ break;
+ index++;
+ if (index == dnsHosts.Length)
+ index = 0;
+ pos++;
}
- if (stream != null)
- break;
- index++;
- if (index == dnsHosts.Length)
- index = 0;
- pos++;
+ catch (Exception)
+ {
+ // if on last host then throw
+ if (pos >= dnsHosts.Length - 1) throw;
+ // else continue
+ }
}
return stream;
@@ -114,24 +118,11 @@
}
#if !CF
- private Stream CreateNamedPipeStream(string hostname)
- {
- string pipePath;
- if (0 == String.Compare(hostname, "localhost", StringComparison.InvariantCultureIgnoreCase))
- pipePath = @"\\.\pipe\" + pipeName;
- else
- pipePath = String.Format(@"\\{0}\pipe\{1}", hostname, pipeName);
- return new NamedPipeStream(pipePath, FileAccess.ReadWrite);
- }
private static EndPoint CreateUnixEndPoint(string host)
{
// first we need to load the Mono.posix assembly
-#if NET20
Assembly a = Assembly.Load("Mono.Posix");
-#else
- Assembly a = Assembly.LoadWithPartialName("Mono.Posix");
-#endif
// then we need to construct a UnixEndPoint object
EndPoint ep = (EndPoint)a.CreateInstance("Mono.Posix.UnixEndPoint",
@@ -167,7 +158,7 @@
catch (Exception)
{
socket.Close();
- return null;
+ throw;
}
NetworkStream stream = new NetworkStream(socket, true);
GC.SuppressFinalize(socket);
Modified: branches/6.0/MySql.Data/Provider/Source/parameter_collection.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/parameter_collection.cs 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.Data/Provider/Source/parameter_collection.cs 2009-06-08 16:01:39 UTC (rev 1636)
@@ -46,12 +46,7 @@
internal MySqlParameterCollection(MySqlCommand cmd)
{
indexHashCS = new Hashtable();
-#if NET20
indexHashCI = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
-#else
- indexHashCI = new Hashtable(new CaseInsensitiveHashCodeProvider(),
- new CaseInsensitiveComparer());
-#endif
Clear();
owningCommand = cmd;
}
Modified: branches/6.0/MySql.VisualStudio/DDEX/MySqlDataViewSupport.xml
===================================================================
--- branches/6.0/MySql.VisualStudio/DDEX/MySqlDataViewSupport.xml 2009-06-05 20:49:35 UTC (rev 1635)
+++ branches/6.0/MySql.VisualStudio/DDEX/MySqlDataViewSupport.xml 2009-06-08 16:01:39 UTC (rev 1636)
@@ -99,7 +99,8 @@
<SelectionNode nid="Table">
<Icon name="Table"/>
<Children>
- <Selection type="Column" restrictions="null,{Table.Schema},{Table.Name}" hideWhen="False AND False">
+ <Selection type="Column" restrictions="null,{Table.Schema},{Table.Name}"
+ hideWhen="False AND False">
<SelectionNode>
<Icon name="Column"/>
</SelectionNode>
| Thread |
|---|
| • Connector/NET commit: r1636 - in branches/6.0: . MySql.Data/Provider MySql.Data/Provider/Properties MySql.Data/Provider/Source MySql.Data/Provider/Sou... | rburnett | 8 Jun |
