Modified:
trunk/CHANGES
trunk/Client.build
trunk/Installer/main.wxs
trunk/Installer/samples.wxs
trunk/Installer/sources.wxs
trunk/Package.build
trunk/README
trunk/Release Notes.txt
trunk/TestSuite/Properties/AssemblyInfo.cs
trunk/mysqlclient/AssemblyInfo.cs
Log:
last few changes prior to release
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/CHANGES 2006-11-06 21:06:23 UTC (rev 455)
@@ -1,153 +1,153 @@
-Version 5.0.2 (unreleased)
+Version 5.0.2 11-3-2006
- Bugs fixed
- ----------
- Bug #23268 System.FormatException when invoking procedure with ENUM input parameter
- Bug #23538 Exception thrown when GetSchemaTable is called and "fields" is null.
- Bug #23245 Connector Net 5.01 Beta Installer produces Antivirus Error Message
- Bug #23758 Unable to connect to any server - IPv6 related
- Bug #22882 Registry key 'Global' access denied
- Bug #18186 Problem with implementation of PreparedStatement
-
- Other changes
- -------------
- Increased speed of MySqlParameterCollection.IndexOf(string) orders of magnitude
- (parameter name lookups are now strict on use of parameter marker)
- Improved character set mappings
- Turned MySqlPoolManager into a static class and added a static ctor to
- avoid any race conditions related to initializing the hashtable.
- (A similar suggestion came in from a user)
- Added 'Ignore Prepare' connection string option for disabling prepared
- statements application-wide
- Added Installer class to provide custom install type procedures such as modifying
- machine.config
- A nicer exception is displayed if you have added a parameter without the parameter marker.
- Load Data Local InFile is working again
+ Bugs fixed
+ ----------
+ Bug #23268 System.FormatException when invoking procedure with ENUM input parameter
+ Bug #23538 Exception thrown when GetSchemaTable is called and "fields" is null.
+ Bug #23245 Connector Net 5.01 Beta Installer produces Antivirus Error Message
+ Bug #23758 Unable to connect to any server - IPv6 related
+ Bug #22882 Registry key 'Global' access denied
+ Bug #18186 Problem with implementation of PreparedStatement
+
+ Other changes
+ -------------
+ Increased speed of MySqlParameterCollection.IndexOf(string) orders of magnitude
+ (parameter name lookups are now strict on use of parameter marker)
+ Improved character set mappings
+ Turned MySqlPoolManager into a static class and added a static ctor to
+ avoid any race conditions related to initializing the hashtable.
+ (A similar suggestion came in from a user)
+ Added 'Ignore Prepare' connection string option for disabling prepared
+ statements application-wide
+ Added Installer class to provide custom install type procedures such as modifying
+ machine.config
+ A nicer exception is displayed if you have added a parameter without the parameter marker.
+ Load Data Local InFile is working again
Version 5.0.1 (Beta)
- Bugs fixed
- ----------
- Bug #21521 # Symbols not allowed in column/table names.
- Bug #21874 MySqlException should derive from DbException
- Bug #22042 mysql-connector-net-5.0.0-alpha BeginTransaction
- Bug #22452 MySql.Data.MySqlClient.MySqlException:
-
- Other changes
- -------------
- Implemented simple local transactions
- Added overloaded methods in MySqlDataReader for getting a column value right from column name
- Replaced use of .NET 2.0 compression code with open source zlib library
- Fixed compression
- Fixed some problems with GetSchema and the Indexes and IndexColumns collections
- Fixed shared memory connections
- Implemented command canceling for MySQL 5.0.0 and higher
- Fixed problem with executing a Fill after a FillSchema
- Implemented CommandTimeout for non-batch queries
- Fixed socket create code related to IPv6 (thanks Mark!)
- Added foreign key support to GetSchema
- Fixed installer to add assembly to GAC and machine.config
+ Bugs fixed
+ ----------
+ Bug #21521 # Symbols not allowed in column/table names.
+ Bug #21874 MySqlException should derive from DbException
+ Bug #22042 mysql-connector-net-5.0.0-alpha BeginTransaction
+ Bug #22452 MySql.Data.MySqlClient.MySqlException:
+
+ Other changes
+ -------------
+ Implemented simple local transactions
+ Added overloaded methods in MySqlDataReader for getting a column value right from column name
+ Replaced use of .NET 2.0 compression code with open source zlib library
+ Fixed compression
+ Fixed some problems with GetSchema and the Indexes and IndexColumns collections
+ Fixed shared memory connections
+ Implemented command canceling for MySQL 5.0.0 and higher
+ Fixed problem with executing a Fill after a FillSchema
+ Implemented CommandTimeout for non-batch queries
+ Fixed socket create code related to IPv6 (thanks Mark!)
+ Added foreign key support to GetSchema
+ Fixed installer to add assembly to GAC and machine.config
Version 5.0.1 (Alpha)
- Bugs fixed
- ----------
- Bug #6214 CommandText: Question mark in comment line is being parsed as a parameter [fixed]
+ Bugs fixed
+ ----------
+ Bug #6214 CommandText: Question mark in comment line is being parsed as a parameter [fixed]
- Other changes
- -------------
- Implemented Usage Advisor
- Added Async query methods
- Reimplemented PacketReader/PacketWriter support into MySqlStream class
- Added internal implemention of SHA1 so we don't have to distribute the OpenNetCF on mobile devices
- Added usage advisor warnings for requesting column values by the wrong type
- Reworked connection string classes to be simpler and faster
- Added procedure metadata caching
- Added perfmon hooks for stored procedure cache hits and misses
- Implemented MySqlConnectionBuilder class
- Implemented MySqlClientFactory class
- Implemented classes and interfaces for ADO.Net 2.0 support
- Replaced use of ICSharpCode with .NET 2.0 internal deflate support
- Refactored test suite to test all protocols in a single pass
- Completely refactored how column values are handled to avoid boxing in some cases
+ Other changes
+ -------------
+ Implemented Usage Advisor
+ Added Async query methods
+ Reimplemented PacketReader/PacketWriter support into MySqlStream class
+ Added internal implemention of SHA1 so we don't have to distribute the OpenNetCF on mobile devices
+ Added usage advisor warnings for requesting column values by the wrong type
+ Reworked connection string classes to be simpler and faster
+ Added procedure metadata caching
+ Added perfmon hooks for stored procedure cache hits and misses
+ Implemented MySqlConnectionBuilder class
+ Implemented MySqlClientFactory class
+ Implemented classes and interfaces for ADO.Net 2.0 support
+ Replaced use of ICSharpCode with .NET 2.0 internal deflate support
+ Refactored test suite to test all protocols in a single pass
+ Completely refactored how column values are handled to avoid boxing in some cases
-Version 1.0.8 (not yet released)
+Version 1.0.8
- Other changes
- -------------
- Implemented a stored procedure cache
- Changed how stored procedure metadata is retrieved to allow users without select privs
- on mysql.proc to use them
-
- Bugs fixed or addressed
- -----------------------
- Bug #16659 Can't use double quotation marks(") as password access server by Connector/NET [fixed]
- Bug #17375 CommandBuilder ignores Unsigned flag at Parameter creation [fixed]
- Bug #17749 There is no char type in MySqlDbType [fixed]
- Bug #16788 Only byte arrays and strings can be serialized by MySqlBinary [fixed]
- Bug #16645 FOUND_ROWS() Bug [can't repeat - added test case]
- Bug #18570 Unsigned tinyint (NET byte) incorrectly determined param type from param val [fixed]
- Bug #19261 Supplying Input Parameters [fixed]
- Bug #19481 Where clause with datetime throws exception [any warning causes the exception] [fixed]
- Bug #15077 Error MySqlCommandBuilder.DeriveParameters for sp without parameters. [fixed]
- Bug #16934 Unsigned values > 2^63 (UInt64) cannot be used in prepared statements
- Bug #19515 DiscoverParameters fails on numeric datatype [fixed]
- Bug #17814 Stored procedure fails unless DbType set explicitly [fixed]
- Bug #19294 IDataRecord.GetString method should return null for null values [fixed]
- Bug #13590 ExecuteScalar returns only Int64 regardless of actual SQL type [added test case]
- Bug #19017 GetBytes Error [fixed]
- Bug #19936 DataReader already open exception [fixed]
- Bug #17106 MySql.Data.MySqlClient.CharSetMap.GetEncoding thread synchronization issue [fixed]
- Bug #17736 Selecting a row with with empty date '0000-00-00' results in Read() hanging. [fixed]
- Bug #20581 Null Reference Exception when closing reader after stored procedure.
- Bug #16884 Invalid DateTime Values from DataReader
- Bug #7248 There is already an open DataReader associated with this Connection which must
- Bug #22400 Nested transactions
- Bug #11991 ExecuteScalar
- Bug #14592 Wrong column length returned for VARCHAR UTF8 columns
- Bug #18391 Better error handling for the .NET class "MySqlCommand" needed.
- Bug #8131 Data Adapter doesn't close connection
- Bug #9619 Cannot update row using DbDataAdapter when row contains an invalid date
- Bug #15112 MySqlDateTime Constructor
+ Other changes
+ -------------
+ Implemented a stored procedure cache
+ Changed how stored procedure metadata is retrieved to allow users without select privs
+ on mysql.proc to use them
+
+ Bugs fixed or addressed
+ -----------------------
+ Bug #16659 Can't use double quotation marks(") as password access server by Connector/NET [fixed]
+ Bug #17375 CommandBuilder ignores Unsigned flag at Parameter creation [fixed]
+ Bug #17749 There is no char type in MySqlDbType [fixed]
+ Bug #16788 Only byte arrays and strings can be serialized by MySqlBinary [fixed]
+ Bug #16645 FOUND_ROWS() Bug [can't repeat - added test case]
+ Bug #18570 Unsigned tinyint (NET byte) incorrectly determined param type from param val [fixed]
+ Bug #19261 Supplying Input Parameters [fixed]
+ Bug #19481 Where clause with datetime throws exception [any warning causes the exception] [fixed]
+ Bug #15077 Error MySqlCommandBuilder.DeriveParameters for sp without parameters. [fixed]
+ Bug #16934 Unsigned values > 2^63 (UInt64) cannot be used in prepared statements
+ Bug #19515 DiscoverParameters fails on numeric datatype [fixed]
+ Bug #17814 Stored procedure fails unless DbType set explicitly [fixed]
+ Bug #19294 IDataRecord.GetString method should return null for null values [fixed]
+ Bug #13590 ExecuteScalar returns only Int64 regardless of actual SQL type [added test case]
+ Bug #19017 GetBytes Error [fixed]
+ Bug #19936 DataReader already open exception [fixed]
+ Bug #17106 MySql.Data.MySqlClient.CharSetMap.GetEncoding thread synchronization issue [fixed]
+ Bug #17736 Selecting a row with with empty date '0000-00-00' results in Read() hanging. [fixed]
+ Bug #20581 Null Reference Exception when closing reader after stored procedure.
+ Bug #16884 Invalid DateTime Values from DataReader
+ Bug #7248 There is already an open DataReader associated with this Connection which must
+ Bug #22400 Nested transactions
+ Bug #11991 ExecuteScalar
+ Bug #14592 Wrong column length returned for VARCHAR UTF8 columns
+ Bug #18391 Better error handling for the .NET class "MySqlCommand" needed.
+ Bug #8131 Data Adapter doesn't close connection
+ Bug #9619 Cannot update row using DbDataAdapter when row contains an invalid date
+ Bug #15112 MySqlDateTime Constructor
Version 1.0.7
- Bugs fixed or addressed
- -------------------------
- Bug #13658 connection.state does not update on Ping() [ fixed ]
- Bug #13590 ExecuteScalar returns only Int64 regardless of actual SQL type [added test case]
- Bug #13662 Prepare() truncates accented character input [already fixed, added test]
- Bug #11947 MySQLCommandBuilder mishandling CONCAT() aliased column [updated test case]
- Bug #13541 Prepare breaks if a parameter is used more than once [fixed]
- Bug #13632 the MySQLCommandBuilder.deriveparameters has not been updated for MySQL 5
- Bug #13753 Exception calling stored procedure with special characters in parameters
- Bug #11386 Numeric parameters with Precision and Scale not taken into account by Connector [added test case]
- Bug #6902 Errors in parsing stored procedure parameters [fixed before, refixed]
- Bug #13927 Multiple Records to same Table in Transaction Problem [fixed]
- Bug #14631 "#42000Query was empty" [fixed]
- Bug #13806 Does not support Code Page 932
+ Bugs fixed or addressed
+ -------------------------
+ Bug #13658 connection.state does not update on Ping() [ fixed ]
+ Bug #13590 ExecuteScalar returns only Int64 regardless of actual SQL type [added test case]
+ Bug #13662 Prepare() truncates accented character input [already fixed, added test]
+ Bug #11947 MySQLCommandBuilder mishandling CONCAT() aliased column [updated test case]
+ Bug #13541 Prepare breaks if a parameter is used more than once [fixed]
+ Bug #13632 the MySQLCommandBuilder.deriveparameters has not been updated for MySQL 5
+ Bug #13753 Exception calling stored procedure with special characters in parameters
+ Bug #11386 Numeric parameters with Precision and Scale not taken into account by Connector [added test case]
+ Bug #6902 Errors in parsing stored procedure parameters [fixed before, refixed]
+ Bug #13927 Multiple Records to same Table in Transaction Problem [fixed]
+ Bug #14631 "#42000Query was empty" [fixed]
+ Bug #13806 Does not support Code Page 932
- Other changes
- -------------------------
- Failure to provide parameters for out and inout values is now detected
- Changed pooling code to remove issue of skipping Ping() on bogus connnections
+ Other changes
+ -------------------------
+ Failure to provide parameters for out and inout values is now detected
+ Changed pooling code to remove issue of skipping Ping() on bogus connnections
Version 1.0.6
- Bugs fixed or addressed
- -------------------------
- Bug #13036 Returns error when field names contain any of the following chars %<>()/ etc [fixed]
- Bug #12835 1.0.5 won't install on system with 1.0.4 installed [fixed]
- Bug #12978 Fatal Error C# Compilation [fixed]
- Bug #13276 Exception on serialize after inserting null value [fixed]
- Bug #13345 Connecting from mono 1.1.8 to MySQL 5.0 using MySQL Connector/Net 1.0.5
-
- Other changes
- -------------------------
- Changed SocketStream and StreamCreator to be compatible with Mono
- Added options to not reset and reconfigure connections pulled from the pool
- Connections pulled from the pool that are not reset are also not pinged
+ Bugs fixed or addressed
+ -------------------------
+ Bug #13036 Returns error when field names contain any of the following chars %<>()/ etc [fixed]
+ Bug #12835 1.0.5 won't install on system with 1.0.4 installed [fixed]
+ Bug #12978 Fatal Error C# Compilation [fixed]
+ Bug #13276 Exception on serialize after inserting null value [fixed]
+ Bug #13345 Connecting from mono 1.1.8 to MySQL 5.0 using MySQL Connector/Net 1.0.5
+ Other changes
+ -------------------------
+ Changed SocketStream and StreamCreator to be compatible with Mono
+ Added options to not reset and reconfigure connections pulled from the pool
+ Connections pulled from the pool that are not reset are also not pinged
+
Version 1.0.5
Bugs fixed or addressed
Modified: trunk/Client.build
===================================================================
--- trunk/Client.build 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/Client.build 2006-11-06 21:06:23 UTC (rev 455)
@@ -32,16 +32,17 @@
</if>
<!-- builds the client on all supported frameworks -->
- <target name="allframeworks" depends="net-1.1, net-2.0, mono-1.0">
+ <target name="allframeworks" depends="net-2.0">
<call target="Docs"/>
</target>
<!-- core managed driver target -->
<target name="client" description="Core client target">
+ <property name="nunit-lib" value="${nunit.dir}/bin"/>
<property name="nant.settings.currentframework" value="${framework}"/>
<property name="outdir" value="mysqlclient/bin/${framework}/${buildType}"/>
- <mkdir dir="${outdir}" failonerror="false"/>
+ <mkdir dir="${outdir}" failonerror="false"/>
<resgen input="mysqlclient/Resources.resx" output="mysqlclient/Resources.resources"/>
<csc output="${outdir}/MySql.Data.dll" target="library"
define="${defines}" debug="${debug}" optimize="${opt}" keycontainer="ConnectorNet"
@@ -77,18 +78,20 @@
<!-- core managed driver target 1.1 -->
<target name="net-1.1" description="1.1 .NET target">
- <property name="nunit-lib" value="${nunit.dir}/bin"/>
+ <property name="nunit.dir" value="${nunit1.dir}"/>
<property name="framework" value="net-1.1"/>
<call target="client"/>
</target>
<!-- core managed driver target 2.0 -->
<target name="net-2.0" description="2.0 .NET target">
- <property name="nunit-lib" value="${nunit.dir}/bin"/>
+ <property name="nunit.dir" value="${nunit2.dir}"/>
<property name="framework" value="net-2.0"/>
- <property name="defines" value="${defines},NET20"/>
+ <if test="${string::get-length(defines) > 0}">
+ <property name="defines" value="${defines},"/>
+ </if>
+ <property name="defines" value="${defines}NET20"/>
<call target="client"/>
- <call target="Docs"/>
</target>
<!-- core managed driver target mono 1.0 -->
Modified: trunk/Installer/main.wxs
===================================================================
--- trunk/Installer/main.wxs 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/Installer/main.wxs 2006-11-06 21:06:23 UTC (rev 455)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<?define ProductVersion="5.0.1"?>
+<?define ProductVersion="5.0.2"?>
<?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
- <Product Id="b6b832e4-5bcb-4030-8cb7-d05eefd0e950" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
+ <Product Id="E9E76B08-5DCB-47d4-B8FD-B8B0FD51932F" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
- <Package Id="2401da2d-92c6-49ac-a3e5-c3ac7b89bf45" Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
+ <Package Id="B1855AEF-1ACC-4c06-AEF8-A6BDCD651598" Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
<Media Id="1" EmbedCab="yes" Cabinet="ConnectorNet.cab" CompressionLevel="high" />
@@ -34,7 +34,7 @@
<!-- Top level junk - readme, changelog, etc -->
<DirectoryRef Id='INSTALLDIR'>
- <Component Id="BaseComponents" Guid="572845ef-138a-40d0-be9f-5a98b415f83e" DiskId="1">
+ <Component Id="BaseComponents" Guid="EDA8C4DA-432F-4eb5-AED4-A057C2B95BDC" DiskId="1">
<File Id="ChangeLog" Name="CLog" LongName="CHANGES" src="..\CHANGES" />
<File Id="RelNotes" Name="RelNotes" LongName="Release Notes.txt" src="..\Release Notes.txt" />
<?if $(var.IsGPL) = true ?>
@@ -49,20 +49,20 @@
<!-- .Net 2.0 Binaries -->
<DirectoryRef Id='BinNet20'>
- <Component Id="Net20" Guid="529dc176-92d0-4f14-ab09-25f611ce2959">
+ <Component Id="Net20" Guid="BA887AEB-53F3-4a54-AEEF-1E31C58EF0E5">
<File Id="CoreBin20" Name="MD20" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1" />
<File Id="CoreBin20Config" Name="mdconfig" LongName="CustomAction.config" src="CustomAction.config" DiskId="1"/>
<Registry Id="vs80registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]bin\.NET 2.0\" />
</Component>
- <Component Id="GAC20" DiskId="1" Guid="302b607b-2633-4b2c-b3da-476a50574b16">
-<!-- <Condition><![CDATA[REGISTERGAC="1"]]></Condition>-->
+ <Component Id="GAC20" DiskId="1" Guid="36FCD23F-7319-40ba-9B1C-5C5DDE16C439">
+ <Condition><![CDATA[REGISTERGAC="1"]]></Condition>
<File Id="CoreBin20GAC" Name="MD20" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" />
</Component>
</DirectoryRef>
<!-- Start menu junk -->
<DirectoryRef Id='ShortCutDir'>
- <Component Id="StartMenuComponent" Guid="1ee0b5b1-91b2-4acf-b17b-98608f6f4d15">
+ <Component Id="StartMenuComponent" Guid="E7943593-5115-425c-BD1F-8D341CC50590">
<Condition><![CDATA[CREATESTARTMENU="1"]]></Condition>
<Shortcut Id="S100" Name="Docs" LongName="Documentation"
Description="Complete documentation for the connector"
@@ -76,7 +76,7 @@
</DirectoryRef>
<DirectoryRef Id='DocsDir'>
- <Component Id="Docs" Guid="bdb99782-9ac0-4ca5-827c-c54cb53bd779">
+ <Component Id="Docs" Guid="4F9C3D2F-86C3-44b3-A00B-030DDD2D24D6">
<File Id="CoreCHM" Name="Docs" LongName="MySql.Data.chm" src="..\doc\MySql.Data.chm" DiskId="1" />
</Component>
</DirectoryRef>
Modified: trunk/Installer/samples.wxs
===================================================================
--- trunk/Installer/samples.wxs 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/Installer/samples.wxs 2006-11-06 21:06:23 UTC (rev 455)
@@ -4,7 +4,7 @@
<DirectoryRef Id='SampleDir'>
<Directory Id="TableEditor" Name="teditor" LongName="Table Editor">
<Directory Id="teCS" Name="cs">
- <Component Id="Sample1CS" Guid="392909ac-7967-4a5c-a836-ad37fd41cf63">
+ <Component Id="Sample1CS" Guid="490FB527-A57A-49f8-97F3-8246C4FEC7A9">
<File Id="teCS1" Name="App.ico" src="..\Samples\TableEditor\cs\App.ico" DiskId="1"/>
<File Id="teCS2" Name="AssInfo.cs" LongName="AssemblyInfo.cs" src="..\Samples\TableEditor\cs\AssemblyInfo.cs" DiskId="1"/>
<File Id="teCS3" Name="Form1.cs" src="..\Samples\TableEditor\cs\Form1.cs" DiskId="1"/>
@@ -14,7 +14,7 @@
</Component>
</Directory>
<Directory Id="teVB" Name="vb">
- <Component Id="Sample1VB" Guid="6b14a3cd-46a7-43eb-ab3c-5a00c3f53fd9">
+ <Component Id="Sample1VB" Guid="BE0B0319-1DE0-474a-9F75-55D1D00AE355">
<File Id="teVB2" Name="AssInfo.vb" LongName="AssemblyInfo.vb" src="..\Samples\TableEditor\vb\AssemblyInfo.vb" DiskId="1"/>
<File Id="teVB3" Name="Form1.vb" src="..\Samples\TableEditor\vb\Form1.vb" DiskId="1"/>
<File Id="teVB4" Name="Form1.res" LongName="Form1.resx" src="..\Samples\TableEditor\vb\Form1.resx" DiskId="1"/>
@@ -25,7 +25,7 @@
</Directory>
<Directory Id="Async" Name="Async">
<Directory Id="asyncCS" Name="cs">
- <Component Id="Sample2CS" Guid="a2e90c88-f822-4bce-bc21-c9e2d3509632">
+ <Component Id="Sample2CS" Guid="4F2A9038-8D50-4e5c-AF26-9764F1FF2636">
<File Id="sample2file1" Name="App.ico" src="..\Samples\Async\cs\App.ico" DiskId="1"/>
<File Id="sample2file2" Name="AssInfo.cs" LongName="AssemblyInfo.cs" src="..\Samples\Async\cs\AssemblyInfo.cs" DiskId="1"/>
<File Id="sample2file3" Name="Form1.cs" src="..\Samples\Async\cs\Form1.cs" DiskId="1"/>
Modified: trunk/Installer/sources.wxs
===================================================================
--- trunk/Installer/sources.wxs 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/Installer/sources.wxs 2006-11-06 21:06:23 UTC (rev 455)
@@ -1,108 +1,109 @@
-<?xml version="1.0"?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
- <Fragment Id='SourceFragment'>
- <DirectoryRef Id='SourceDir'>
- <Component Id="TopLevelSrc" Guid="f1c97712-f21c-4a1a-9c3b-37fd42163a3f">
- <File Id="nantFile" Name="client.bld" LongName="client.build" src="..\client.build" DiskId="1"/>
- <File Id="sln2005" Name="MySql5.sln" LongName="MySqlClient.2005.sln" src="..\MySQLClient.2005.sln" DiskId="1"/>
- <File Id="sln2003" Name="MySql3.sln" LongName="MySqlClient.2003.sln" src="..\MySQLClient.2003.sln" DiskId="1"/>
- </Component>
- <Directory Id="clientFolder" Name="msc" LongName="MySqlClient">
- <Component Id="ClientSrc" DiskId="1" Guid="e79a81cc-7f4a-420d-a58c-2a90f0b6f372">
- <File Id="file0" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\mysqlclient\AssemblyInfo.cs" />
- <File Id="file1" Name="CHARSE_1.CS" LongName="CharSetMap.cs" src="..\mysqlclient\CharSetMap.cs" />
- <File Id="file2" Name="command.cs" src="..\mysqlclient\command.cs" />
- <File Id="file3" Name="COMMAN_1.CS" LongName="CommandBuilder.cs" src="..\mysqlclient\CommandBuilder.cs" />
- <File Id="file4" Name="COMPRE_1.CS" LongName="CompressedStream.cs" src="..\mysqlclient\CompressedStream.cs" />
- <File Id="file5" Name="CONNEC_1.CS" LongName="Connection.cs" src="..\mysqlclient\Connection.cs" />
- <File Id="file6" Name="Crypt.cs" src="..\mysqlclient\Crypt.cs" />
- <File Id="file7" Name="DATAAD_1.CS" LongName="dataadapter.cs" src="..\mysqlclient\dataadapter.cs" />
- <File Id="file8" Name="DATARE_1.CS" LongName="datareader.cs" src="..\mysqlclient\datareader.cs" />
- <File Id="file10" Name="Driver.cs" src="..\mysqlclient\Driver.cs" />
- <File Id="file11" Name="EXCEPT_1.CS" LongName="Exception.cs" src="..\mysqlclient\Exception.cs" />
- <File Id="file12" Name="Field.cs" src="..\mysqlclient\Field.cs" />
- <File Id="file14" Name="ISSCHE_1.CS" LongName="ISSchemaProvider.cs" src="..\mysqlclient\ISSchemaProvider.cs" />
- <File Id="file15" Name="Logger.cs" src="..\mysqlclient\Logger.cs" />
+<?xml version="1.0"?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
+ <Fragment Id='SourceFragment'>
+ <DirectoryRef Id='SourceDir'>
+ <Component Id="TopLevelSrc" Guid="A2B68033-573D-4943-8CBA-1D3E4FF06385">
+ <File Id="nantFile" Name="client.bld" LongName="client.build" src="..\client.build" DiskId="1"/>
+ <File Id="sln2005" Name="MySql5.sln" LongName="MySqlClient.2005.sln" src="..\MySQLClient.2005.sln" DiskId="1"/>
+ <File Id="sln2003" Name="MySql3.sln" LongName="MySqlClient.2003.sln" src="..\MySQLClient.2003.sln" DiskId="1"/>
+ </Component>
+ <Directory Id="clientFolder" Name="msc" LongName="MySqlClient">
+ <Component Id="ClientSrc" DiskId="1" Guid="F8D96273-EC96-4948-8649-BC653BA4953D">
+ <File Id="file0" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\mysqlclient\AssemblyInfo.cs" />
+ <File Id="file1" Name="CHARSE_1.CS" LongName="CharSetMap.cs" src="..\mysqlclient\CharSetMap.cs" />
+ <File Id="file2" Name="command.cs" src="..\mysqlclient\command.cs" />
+ <File Id="file3" Name="COMMAN_1.CS" LongName="CommandBuilder.cs" src="..\mysqlclient\CommandBuilder.cs" />
+ <File Id="file4" Name="COMPRE_1.CS" LongName="CompressedStream.cs" src="..\mysqlclient\CompressedStream.cs" />
+ <File Id="file5" Name="CONNEC_1.CS" LongName="Connection.cs" src="..\mysqlclient\Connection.cs" />
+ <File Id="file6" Name="Crypt.cs" src="..\mysqlclient\Crypt.cs" />
+ <File Id="file7" Name="DATAAD_1.CS" LongName="dataadapter.cs" src="..\mysqlclient\dataadapter.cs" />
+ <File Id="file8" Name="DATARE_1.CS" LongName="datareader.cs" src="..\mysqlclient\datareader.cs" />
+ <File Id="file10" Name="Driver.cs" src="..\mysqlclient\Driver.cs" />
+ <File Id="file11" Name="EXCEPT_1.CS" LongName="Exception.cs" src="..\mysqlclient\Exception.cs" />
+ <File Id="file12" Name="Field.cs" src="..\mysqlclient\Field.cs" />
+ <File Id="file14" Name="ISSCHE_1.CS" LongName="ISSchemaProvider.cs" src="..\mysqlclient\ISSchemaProvider.cs" />
+ <File Id="file15" Name="Logger.cs" src="..\mysqlclient\Logger.cs" />
<File Id="file17" Name="MYSQLD_2.CSP" LongName="MySql.Data.2005.csproj" src="..\mysqlclient\MySql.Data.2005.csproj" />
<File Id="file42" Name="MYSQLD_3.CSP" LongName="MySql.Data.2003.csproj" src="..\mysqlclient\MySql.Data.2003.csproj" />
- <File Id="file18" Name="MYSQLC_1.CS" LongName="MySqlClientFactory.cs" src="..\mysqlclient\MySqlClientFactory.cs" />
- <File Id="file19" Name="MYSQLC_2.CS" LongName="MySqlConnectionStringBuilder.cs" src="..\mysqlclient\MySqlConnectionStringBuilder.cs" />
- <File Id="file20" Name="MYSQLD_1.CS" LongName="MysqlDefs.cs" src="..\mysqlclient\MysqlDefs.cs" />
- <File Id="file21" Name="MYSQLE_1.CS" LongName="MySqlError.cs" src="..\mysqlclient\MySqlError.cs" />
- <File Id="file22" Name="MYSQLH_1.CS" LongName="MySqlHelper.cs" src="..\mysqlclient\MySqlHelper.cs" />
- <File Id="file23" Name="MYSQLP_1.CS" LongName="MySqlPool.cs" src="..\mysqlclient\MySqlPool.cs" />
- <File Id="file24" Name="MYSQLP_2.CS" LongName="MySqlPoolManager.cs" src="..\mysqlclient\MySqlPoolManager.cs" />
+ <File Id="file18" Name="MYSQLC_1.CS" LongName="MySqlClientFactory.cs" src="..\mysqlclient\MySqlClientFactory.cs" />
+ <File Id="file19" Name="MYSQLC_2.CS" LongName="MySqlConnectionStringBuilder.cs" src="..\mysqlclient\MySqlConnectionStringBuilder.cs" />
+ <File Id="file20" Name="MYSQLD_1.CS" LongName="MysqlDefs.cs" src="..\mysqlclient\MysqlDefs.cs" />
+ <File Id="file21" Name="MYSQLE_1.CS" LongName="MySqlError.cs" src="..\mysqlclient\MySqlError.cs" />
+ <File Id="file22" Name="MYSQLH_1.CS" LongName="MySqlHelper.cs" src="..\mysqlclient\MySqlHelper.cs" />
+ <File Id="file23" Name="MYSQLP_1.CS" LongName="MySqlPool.cs" src="..\mysqlclient\MySqlPool.cs" />
+ <File Id="file24" Name="MYSQLP_2.CS" LongName="MySqlPoolManager.cs" src="..\mysqlclient\MySqlPoolManager.cs" />
<File Id="file43" Name="MySqlP_3.cs" LongName="MySqlPromotableTransaction.cs" src="..\mysqlclient\MySqlPromotableTransaction.cs" />
<File Id="file25" Name="MYSQLS_1.CS" LongName="MySqlStream.cs" src="..\mysqlclient\MySqlStream.cs" />
- <File Id="file26" Name="NATIVE_1.CS" LongName="NativeDriver.cs" src="..\mysqlclient\NativeDriver.cs" />
- <File Id="file27" Name="PARAME_1.CS" LongName="parameter.cs" src="..\mysqlclient\parameter.cs" />
- <File Id="file28" Name="PARAME_2.CS" LongName="parameter_collection.cs" src="..\mysqlclient\parameter_collection.cs" />
- <File Id="file29" Name="PERFOR_1.CS" LongName="PerformanceMonitor.cs" src="..\mysqlclient\PerformanceMonitor.cs" />
- <File Id="file30" Name="PREPAR_1.CS" LongName="PreparableStatement.cs" src="..\mysqlclient\PreparableStatement.cs" />
- <File Id="file31" Name="PROCED_1.CS" LongName="ProcedureCache.cs" src="..\mysqlclient\ProcedureCache.cs" />
- <File Id="file36" Name="RESOUR_1.RES" LongName="Resources.resx" src="..\mysqlclient\Resources.resx" />
+ <File Id="file26" Name="NATIVE_1.CS" LongName="NativeDriver.cs" src="..\mysqlclient\NativeDriver.cs" />
+ <File Id="file27" Name="PARAME_1.CS" LongName="parameter.cs" src="..\mysqlclient\parameter.cs" />
+ <File Id="file28" Name="PARAME_2.CS" LongName="parameter_collection.cs" src="..\mysqlclient\parameter_collection.cs" />
+ <File Id="file29" Name="PERFOR_1.CS" LongName="PerformanceMonitor.cs" src="..\mysqlclient\PerformanceMonitor.cs" />
+ <File Id="file30" Name="PREPAR_1.CS" LongName="PreparableStatement.cs" src="..\mysqlclient\PreparableStatement.cs" />
+ <File Id="file31" Name="PROCED_1.CS" LongName="ProcedureCache.cs" src="..\mysqlclient\ProcedureCache.cs" />
+ <File Id="file36" Name="RESOUR_1.RES" LongName="Resources.resx" src="..\mysqlclient\Resources.resx" />
<File Id="file44" Name="RESOUR_2.RES" LongName="Resources.Designer.cs" src="..\mysqlclient\Resources.Designer.cs" />
- <File Id="file37" Name="SCHEMA_1.CS" LongName="SchemaProvider.cs" src="..\mysqlclient\SchemaProvider.cs" />
- <File Id="file38" Name="STATEM_1.CS" LongName="Statement.cs" src="..\mysqlclient\Statement.cs" />
- <File Id="file39" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\mysqlclient\StoredProcedure.cs" />
- <File Id="file40" Name="TRANSA_1.CS" LongName="transaction.cs" src="..\mysqlclient\transaction.cs" />
- <File Id="file41" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\mysqlclient\UsageAdvisor.cs" />
- <File Id="file45" Name="Reserv_1.txt" LongName="ReservedWords.txt" src="..\mysqlclient\ReservedWords.txt"/>
- </Component>
- <Directory Id="commonFolder" Name="Common">
- <Component Id="CommonSrc" DiskId="1" Guid="237ec06a-e0df-4f1b-976a-ba2f1aaa0de4">
- <File Id="file179" Name="CONTEX_1.CS" LongName="ContextString.cs" src="..\mysqlclient\common\ContextString.cs" />
- <File Id="file180" Name="NAMEDP_1.CS" LongName="NamedPipeStream.cs" src="..\mysqlclient\common\NamedPipeStream.cs" />
- <File Id="file181" Name="NATIVE_1.CS" LongName="NativeMethods.cs" src="..\mysqlclient\common\NativeMethods.cs" />
- <File Id="file182" Name="Platform.cs" src="..\mysqlclient\common\Platform.cs" />
- <File Id="file184" Name="SHA1.cs" src="..\mysqlclient\common\SHA1.cs" />
- <File Id="file185" Name="SHARED_1.cs" LongName="SharedMemoryStream.cs" src="..\mysqlclient\common\SharedMemoryStream.cs" />
+ <File Id="file37" Name="SCHEMA_1.CS" LongName="SchemaProvider.cs" src="..\mysqlclient\SchemaProvider.cs" />
+ <File Id="file38" Name="STATEM_1.CS" LongName="Statement.cs" src="..\mysqlclient\Statement.cs" />
+ <File Id="file39" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\mysqlclient\StoredProcedure.cs" />
+ <File Id="file40" Name="TRANSA_1.CS" LongName="transaction.cs" src="..\mysqlclient\transaction.cs" />
+ <File Id="file41" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\mysqlclient\UsageAdvisor.cs" />
+ <File Id="file45" Name="Reserv_1.txt" LongName="ReservedWords.txt" src="..\mysqlclient\ReservedWords.txt"/>
+ <File Id="file46" Name="Instal_1.cs" LongName="Installer.cs" src="..\mysqlclient\Installer.cs"/>
+ </Component>
+ <Directory Id="commonFolder" Name="Common">
+ <Component Id="CommonSrc" DiskId="1" Guid="9D5459FC-9866-4d4d-8838-385CCF75A6A8">
+ <File Id="file179" Name="CONTEX_1.CS" LongName="ContextString.cs" src="..\mysqlclient\common\ContextString.cs" />
+ <File Id="file180" Name="NAMEDP_1.CS" LongName="NamedPipeStream.cs" src="..\mysqlclient\common\NamedPipeStream.cs" />
+ <File Id="file181" Name="NATIVE_1.CS" LongName="NativeMethods.cs" src="..\mysqlclient\common\NativeMethods.cs" />
+ <File Id="file182" Name="Platform.cs" src="..\mysqlclient\common\Platform.cs" />
+ <File Id="file184" Name="SHA1.cs" src="..\mysqlclient\common\SHA1.cs" />
+ <File Id="file185" Name="SHARED_1.cs" LongName="SharedMemoryStream.cs" src="..\mysqlclient\common\SharedMemoryStream.cs" />
<File Id="file186" Name="STREAM_1.cs" LongName="StreamCreator.cs" src="..\mysqlclient\common\StreamCreator.cs" />
<File Id="file187" Name="Socket_1.cs" LongName="SocketStream.cs" src="..\mysqlclient\common\SocketStream.cs" />
- <File Id="file188" Name="Version.cs" src="..\mysqlclient\common\Version.cs" />
- <File Id="file189" Name="WinCE.cs" src="..\mysqlclient\common\WinCE.cs" />
- </Component>
- </Directory>
- <Directory Id="docSrcFolder" Name="Docs">
- <Component Id="DocsSrc" DiskId="1" Guid="20461941-1680-4a17-acf1-d5fc96f32721">
- <File Id="file245" Name="MYSQLC_1.XML" LongName="MySqlCommand.xml" src="..\mysqlclient\docs\MySqlCommand.xml" />
- <File Id="file246" Name="MYSQLC_2.XML" LongName="MySqlCommandBuilder.xml" src="..\mysqlclient\docs\MySqlCommandBuilder.xml" />
- <File Id="file247" Name="MYSQLC_3.XML" LongName="MySqlConnection.xml" src="..\mysqlclient\docs\MySqlConnection.xml" />
- <File Id="file248" Name="MYSQLC_4.XML" LongName="MySqlConnectionStringBuilder.xml" src="..\mysqlclient\docs\MySqlConnectionStringBuilder.xml" />
- <File Id="file249" Name="MYSQLD_1.XML" LongName="MySqlDataAdapter.xml" src="..\mysqlclient\docs\MySqlDataAdapter.xml" />
- <File Id="file250" Name="MYSQLD_2.XML" LongName="MySqlDataReader.xml" src="..\mysqlclient\docs\MySqlDataReader.xml" />
- <File Id="file251" Name="MYSQLE_1.XML" LongName="MySqlException.xml" src="..\mysqlclient\docs\MySqlException.xml" />
- <File Id="file252" Name="MYSQLH_1.XML" LongName="MySqlHelper.xml" src="..\mysqlclient\docs\MySqlHelper.xml" />
- <File Id="file253" Name="MYSQLP_1.XML" LongName="MySqlParameter.xml" src="..\mysqlclient\docs\MySqlParameter.xml" />
- <File Id="file254" Name="MYSQLP_2.XML" LongName="MySqlParameterCollection.xml" src="..\mysqlclient\docs\MySqlParameterCollection.xml" />
- <File Id="file255" Name="MYSQLT_1.XML" LongName="MySqlTransaction.xml" src="..\mysqlclient\docs\MySqlTransaction.xml" />
- </Component>
- </Directory>
- <Directory Id="typesFolder" Name="Types">
- <Component Id="TypesSrc" DiskId="1" Guid="7925d8ea-f9c2-4b1f-a553-22230af64f90">
- <File Id="file299" Name="MetaData.cs" src="..\mysqlclient\Types\MetaData.cs" />
- <File Id="file300" Name="MYSQLB_1.CS" LongName="MySqlBinary.cs" src="..\mysqlclient\Types\MySqlBinary.cs" />
- <File Id="file301" Name="MySqlBit.cs" src="..\mysqlclient\Types\MySqlBit.cs" />
- <File Id="file302" Name="MYSQLB_2.CS" LongName="MySqlByte.cs" src="..\mysqlclient\Types\MySqlByte.cs" />
- <File Id="file303" Name="MYSQLC_1.CS" LongName="MySqlConversionException.cs" src="..\mysqlclient\Types\MySqlConversionException.cs" />
- <File Id="file304" Name="MYSQLD_1.CS" LongName="MySqlDateTime.cs" src="..\mysqlclient\Types\MySqlDateTime.cs" />
- <File Id="file305" Name="MYSQLD_2.CS" LongName="MySqlDecimal.cs" src="..\mysqlclient\Types\MySqlDecimal.cs" />
- <File Id="file306" Name="MYSQLD_3.CS" LongName="MySqlDouble.cs" src="..\mysqlclient\Types\MySqlDouble.cs" />
- <File Id="file307" Name="MYSQLI_1.CS" LongName="MySqlInt16.cs" src="..\mysqlclient\Types\MySqlInt16.cs" />
- <File Id="file308" Name="MYSQLI_2.CS" LongName="MySqlInt32.cs" src="..\mysqlclient\Types\MySqlInt32.cs" />
- <File Id="file309" Name="MYSQLI_3.CS" LongName="MySqlInt64.cs" src="..\mysqlclient\Types\MySqlInt64.cs" />
- <File Id="file310" Name="MYSQLS_1.CS" LongName="MySqlSingle.cs" src="..\mysqlclient\Types\MySqlSingle.cs" />
- <File Id="file311" Name="MYSQLS_2.CS" LongName="MySqlString.cs" src="..\mysqlclient\Types\MySqlString.cs" />
- <File Id="file312" Name="MYSQLT_1.CS" LongName="MySqlTime.cs" src="..\mysqlclient\Types\MySqlTime.cs" />
- <File Id="file313" Name="MYSQLU_1.CS" LongName="MySqlUByte.cs" src="..\mysqlclient\Types\MySqlUByte.cs" />
- <File Id="file314" Name="MYSQLU_2.CS" LongName="MySqlUInt16.cs" src="..\mysqlclient\Types\MySqlUInt16.cs" />
- <File Id="file315" Name="MYSQLU_3.CS" LongName="MySqlUInt32.cs" src="..\mysqlclient\Types\MySqlUInt32.cs" />
- <File Id="file316" Name="MYSQLU_4.CS" LongName="MySqlUInt64.cs" src="..\mysqlclient\Types\MySqlUInt64.cs" />
- <File Id="file317" Name="MYSQLV_1.CS" LongName="MySqlValue.cs" src="..\mysqlclient\Types\MySqlValue.cs" />
- </Component>
- </Directory>
+ <File Id="file188" Name="Version.cs" src="..\mysqlclient\common\Version.cs" />
+ <File Id="file189" Name="WinCE.cs" src="..\mysqlclient\common\WinCE.cs" />
+ </Component>
+ </Directory>
+ <Directory Id="docSrcFolder" Name="Docs">
+ <Component Id="DocsSrc" DiskId="1" Guid="79FCD690-17C5-47a4-854C-C86544F96168">
+ <File Id="file245" Name="MYSQLC_1.XML" LongName="MySqlCommand.xml" src="..\mysqlclient\docs\MySqlCommand.xml" />
+ <File Id="file246" Name="MYSQLC_2.XML" LongName="MySqlCommandBuilder.xml" src="..\mysqlclient\docs\MySqlCommandBuilder.xml" />
+ <File Id="file247" Name="MYSQLC_3.XML" LongName="MySqlConnection.xml" src="..\mysqlclient\docs\MySqlConnection.xml" />
+ <File Id="file248" Name="MYSQLC_4.XML" LongName="MySqlConnectionStringBuilder.xml" src="..\mysqlclient\docs\MySqlConnectionStringBuilder.xml" />
+ <File Id="file249" Name="MYSQLD_1.XML" LongName="MySqlDataAdapter.xml" src="..\mysqlclient\docs\MySqlDataAdapter.xml" />
+ <File Id="file250" Name="MYSQLD_2.XML" LongName="MySqlDataReader.xml" src="..\mysqlclient\docs\MySqlDataReader.xml" />
+ <File Id="file251" Name="MYSQLE_1.XML" LongName="MySqlException.xml" src="..\mysqlclient\docs\MySqlException.xml" />
+ <File Id="file252" Name="MYSQLH_1.XML" LongName="MySqlHelper.xml" src="..\mysqlclient\docs\MySqlHelper.xml" />
+ <File Id="file253" Name="MYSQLP_1.XML" LongName="MySqlParameter.xml" src="..\mysqlclient\docs\MySqlParameter.xml" />
+ <File Id="file254" Name="MYSQLP_2.XML" LongName="MySqlParameterCollection.xml" src="..\mysqlclient\docs\MySqlParameterCollection.xml" />
+ <File Id="file255" Name="MYSQLT_1.XML" LongName="MySqlTransaction.xml" src="..\mysqlclient\docs\MySqlTransaction.xml" />
+ </Component>
+ </Directory>
+ <Directory Id="typesFolder" Name="Types">
+ <Component Id="TypesSrc" DiskId="1" Guid="A4F10442-785E-46f1-9153-16E8C59C5353">
+ <File Id="file299" Name="MetaData.cs" src="..\mysqlclient\Types\MetaData.cs" />
+ <File Id="file300" Name="MYSQLB_1.CS" LongName="MySqlBinary.cs" src="..\mysqlclient\Types\MySqlBinary.cs" />
+ <File Id="file301" Name="MySqlBit.cs" src="..\mysqlclient\Types\MySqlBit.cs" />
+ <File Id="file302" Name="MYSQLB_2.CS" LongName="MySqlByte.cs" src="..\mysqlclient\Types\MySqlByte.cs" />
+ <File Id="file303" Name="MYSQLC_1.CS" LongName="MySqlConversionException.cs" src="..\mysqlclient\Types\MySqlConversionException.cs" />
+ <File Id="file304" Name="MYSQLD_1.CS" LongName="MySqlDateTime.cs" src="..\mysqlclient\Types\MySqlDateTime.cs" />
+ <File Id="file305" Name="MYSQLD_2.CS" LongName="MySqlDecimal.cs" src="..\mysqlclient\Types\MySqlDecimal.cs" />
+ <File Id="file306" Name="MYSQLD_3.CS" LongName="MySqlDouble.cs" src="..\mysqlclient\Types\MySqlDouble.cs" />
+ <File Id="file307" Name="MYSQLI_1.CS" LongName="MySqlInt16.cs" src="..\mysqlclient\Types\MySqlInt16.cs" />
+ <File Id="file308" Name="MYSQLI_2.CS" LongName="MySqlInt32.cs" src="..\mysqlclient\Types\MySqlInt32.cs" />
+ <File Id="file309" Name="MYSQLI_3.CS" LongName="MySqlInt64.cs" src="..\mysqlclient\Types\MySqlInt64.cs" />
+ <File Id="file310" Name="MYSQLS_1.CS" LongName="MySqlSingle.cs" src="..\mysqlclient\Types\MySqlSingle.cs" />
+ <File Id="file311" Name="MYSQLS_2.CS" LongName="MySqlString.cs" src="..\mysqlclient\Types\MySqlString.cs" />
+ <File Id="file312" Name="MYSQLT_1.CS" LongName="MySqlTime.cs" src="..\mysqlclient\Types\MySqlTime.cs" />
+ <File Id="file313" Name="MYSQLU_1.CS" LongName="MySqlUByte.cs" src="..\mysqlclient\Types\MySqlUByte.cs" />
+ <File Id="file314" Name="MYSQLU_2.CS" LongName="MySqlUInt16.cs" src="..\mysqlclient\Types\MySqlUInt16.cs" />
+ <File Id="file315" Name="MYSQLU_3.CS" LongName="MySqlUInt32.cs" src="..\mysqlclient\Types\MySqlUInt32.cs" />
+ <File Id="file316" Name="MYSQLU_4.CS" LongName="MySqlUInt64.cs" src="..\mysqlclient\Types\MySqlUInt64.cs" />
+ <File Id="file317" Name="MYSQLV_1.CS" LongName="MySqlValue.cs" src="..\mysqlclient\Types\MySqlValue.cs" />
+ </Component>
+ </Directory>
<Directory Id="zlibFolder" Name="zlib">
- <Component Id="ZLibSrc" DiskId="1" Guid="04b8a7f1-c402-4b97-b784-7ac5fb1154ed">
+ <Component Id="ZLibSrc" DiskId="1" Guid="C03F64B7-034F-44ac-868E-74C96B919CA4">
<File Id="file500" Name="Adler32.cs" src="..\mysqlclient\zlib\Adler32.cs" />
<File Id="file501" Name="Deflate.cs" src="..\mysqlclient\zlib\Deflate.cs" />
<File Id="file502" Name="InfBlo_1.cs" LongName="InfBlocks.cs" src="..\mysqlclient\zlib\InfBlocks.cs" />
@@ -118,61 +119,67 @@
<File Id="file512" Name="ZStream.cs" src="..\mysqlclient\zlib\ZStream.cs" />
<File Id="file513" Name="ZStrea_1.cs" LongName="ZStreamException.cs" src="..\mysqlclient\zlib\ZStreamException.cs" />
</Component>
- </Directory>
- </Directory>
- <Directory Id="TestSuite" Name="ts" LongName="TestSuite">
- <Component Id="TestSuiteSrc" DiskId="1" Guid="cfe61742-5d9d-452b-9b12-f8adb012bbb4">
- <File Id="file401" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\TestSuite\AssemblyInfo.cs" />
- <File Id="file402" Name="ASYNCT_1.CS" LongName="AsyncTests.cs" src="..\TestSuite\AsyncTests.cs" />
- <File Id="file403" Name="BaseTest.cs" src="..\TestSuite\BaseTest.cs" />
- <File Id="file404" Name="BLOBTE_1.CS" LongName="BlobTests.cs" src="..\TestSuite\BlobTests.cs" />
- <File Id="file405" Name="CHARAC_1.CS" LongName="CharacterSetTests.cs" src="..\TestSuite\CharacterSetTests.cs" />
- <File Id="file406" Name="COMMAN_1.CS" LongName="CommandBuilderTests.cs" src="..\TestSuite\CommandBuilderTests.cs" />
- <File Id="file407" Name="COMMAN_2.CS" LongName="CommandTests.cs" src="..\TestSuite\CommandTests.cs" />
- <File Id="file408" Name="CONNEC_1.CS" LongName="ConnectionTests.cs" src="..\TestSuite\ConnectionTests.cs" />
- <File Id="file409" Name="CULTUR_1.CS" LongName="CultureTests.cs" src="..\TestSuite\CultureTests.cs" />
- <File Id="file410" Name="CURSOR_1.CS" LongName="CursorTests.cs" src="..\TestSuite\CursorTests.cs" />
- <File Id="file411" Name="DATAAD_1.CS" LongName="DataAdapterTests.cs" src="..\TestSuite\DataAdapterTests.cs" />
- <File Id="file412" Name="DATARE_1.CS" LongName="DataReaderTests.cs" src="..\TestSuite\DataReaderTests.cs" />
- <File Id="file413" Name="DATASE_1.CS" LongName="DataSetTest.cs" src="..\TestSuite\DataSetTest.cs" />
- <File Id="file414" Name="DATATY_1.CS" LongName="DataTypeTests.cs" src="..\TestSuite\DataTypeTests.cs" />
- <File Id="file415" Name="DATETI_1.CS" LongName="DateTimeTests.cs" src="..\TestSuite\DateTimeTests.cs" />
- <File Id="file416" Name="EVENTT_1.CS" LongName="EventTests.cs" src="..\TestSuite\EventTests.cs" />
- <File Id="file418" Name="EXCEPT_1.CS" LongName="ExceptionTests.cs" src="..\TestSuite\ExceptionTests.cs" />
- <File Id="file420" Name="GETSCH_1.CS" LongName="GetSchemaTests.cs" src="..\TestSuite\GetSchemaTests.cs" />
- <File Id="file421" Name="INTERF_1.CS" LongName="InterfaceTests.cs" src="..\TestSuite\InterfaceTests.cs" />
- <File Id="file422" Name="LANGUA_1.CS" LongName="LanguageTests.cs" src="..\TestSuite\LanguageTests.cs" />
- <File Id="file424" Name="MICROP_1.CS" LongName="MicroPerfTests.cs" src="..\TestSuite\MicroPerfTests.cs" />
- <File Id="file427" Name="MYSQLD_2.CSP" LongName="MySql.Data.Tests.2005.csproj" src="..\TestSuite\MySql.Data.Tests.2005.csproj" />
+ </Directory>
+ </Directory>
+ <Directory Id="TestSuite" Name="ts" LongName="TestSuite">
+ <Component Id="TestSuiteSrc" DiskId="1" Guid="E0F549CB-3B88-4bea-9231-23F5FA9317A5">
+ <File Id="file402" Name="ASYNCT_1.CS" LongName="AsyncTests.cs" src="..\TestSuite\AsyncTests.cs" />
+ <File Id="file403" Name="BaseTest.cs" src="..\TestSuite\BaseTest.cs" />
+ <File Id="file404" Name="BLOBTE_1.CS" LongName="BlobTests.cs" src="..\TestSuite\BlobTests.cs" />
+ <File Id="file405" Name="CHARAC_1.CS" LongName="CharacterSetTests.cs" src="..\TestSuite\CharacterSetTests.cs" />
+ <File Id="file406" Name="COMMAN_1.CS" LongName="CommandBuilderTests.cs" src="..\TestSuite\CommandBuilderTests.cs" />
+ <File Id="file407" Name="COMMAN_2.CS" LongName="CommandTests.cs" src="..\TestSuite\CommandTests.cs" />
+ <File Id="file408" Name="CONNEC_1.CS" LongName="ConnectionTests.cs" src="..\TestSuite\ConnectionTests.cs" />
+ <File Id="file409" Name="CULTUR_1.CS" LongName="CultureTests.cs" src="..\TestSuite\CultureTests.cs" />
+ <File Id="file410" Name="CURSOR_1.CS" LongName="CursorTests.cs" src="..\TestSuite\CursorTests.cs" />
+ <File Id="file411" Name="DATAAD_1.CS" LongName="DataAdapterTests.cs" src="..\TestSuite\DataAdapterTests.cs" />
+ <File Id="file412" Name="DATARE_1.CS" LongName="DataReaderTests.cs" src="..\TestSuite\DataReaderTests.cs" />
+ <File Id="file413" Name="DATASE_1.CS" LongName="DataSetTest.cs" src="..\TestSuite\DataSetTest.cs" />
+ <File Id="file414" Name="DATATY_1.CS" LongName="DataTypeTests.cs" src="..\TestSuite\DataTypeTests.cs" />
+ <File Id="file415" Name="DATETI_1.CS" LongName="DateTimeTests.cs" src="..\TestSuite\DateTimeTests.cs" />
+ <File Id="file416" Name="EVENTT_1.CS" LongName="EventTests.cs" src="..\TestSuite\EventTests.cs" />
+ <File Id="file418" Name="EXCEPT_1.CS" LongName="ExceptionTests.cs" src="..\TestSuite\ExceptionTests.cs" />
+ <File Id="file420" Name="GETSCH_1.CS" LongName="GetSchemaTests.cs" src="..\TestSuite\GetSchemaTests.cs" />
+ <File Id="file421" Name="INTERF_1.CS" LongName="InterfaceTests.cs" src="..\TestSuite\InterfaceTests.cs" />
+ <File Id="file422" Name="LANGUA_1.CS" LongName="LanguageTests.cs" src="..\TestSuite\LanguageTests.cs" />
+ <File Id="file424" Name="MICROP_1.CS" LongName="MicroPerfTests.cs" src="..\TestSuite\MicroPerfTests.cs" />
+ <File Id="file427" Name="MYSQLD_2.CSP" LongName="MySql.Data.Tests.2005.csproj" src="..\TestSuite\MySql.Data.Tests.2005.csproj" />
<File Id="file428" Name="MYSQLD_3.CSP" LongName="MySql.Data.Tests.2003.csproj" src="..\TestSuite\MySql.Data.Tests.2003.csproj" />
<File Id="file430" Name="MYSQLH_1.CS" LongName="MySqlHelperTests.cs" src="..\TestSuite\MySqlHelperTests.cs" />
- <File Id="file431" Name="PARAME_1.CS" LongName="ParameterTests.cs" src="..\TestSuite\ParameterTests.cs" />
- <File Id="file432" Name="PERFMO_1.CS" LongName="PerfMonTests.cs" src="..\TestSuite\PerfMonTests.cs" />
- <File Id="file433" Name="POOLIN_1.CS" LongName="PoolingTests.cs" src="..\TestSuite\PoolingTests.cs" />
- <File Id="file434" Name="PREPAR_1.CS" LongName="PreparedStatements.cs" src="..\TestSuite\PreparedStatements.cs" />
- <File Id="file435" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\TestSuite\StoredProcedure.cs" />
- <File Id="file436" Name="STRESS_1.CS" LongName="StressTests.cs" src="..\TestSuite\StressTests.cs" />
- <File Id="file437" Name="Syntax.cs" src="..\TestSuite\Syntax.cs" />
- <File Id="file438" Name="THREAD_1.CS" LongName="Threading.cs" src="..\TestSuite\Threading.cs" />
- <File Id="file439" Name="TRANSA_1.CS" LongName="Transactions.cs" src="..\TestSuite\Transactions.cs" />
- <File Id="file440" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\TestSuite\UsageAdvisor.cs" />
- <File Id="file441" Name="Utils.cs" src="..\TestSuite\Utils.cs" />
- <File Id="file442" Name="Simple_1.cs" LongName="SimpleTransactions.cs" src="..\TestSuite\SimpleTransactions.cs"/>
- <File Id="file443" Name="Timeou_1.cs" LongName="TimeoutAndCancel.cs" src="..\TestSuite\TimeoutAndCancel.cs"/>
- <File Id="file444" Name="Syntax2.cs" src="..\TestSuite\Syntax2.cs"/>
- </Component>
- </Directory>
- </DirectoryRef>
-
- <Feature Id='Sources' Level='1' Title='Sources' Description='Source code for all assemblies'>
- <ComponentRef Id='TopLevelSrc'/>
- <ComponentRef Id='ClientSrc'/>
- <ComponentRef Id='CommonSrc'/>
- <ComponentRef Id='DocsSrc'/>
- <ComponentRef Id='TypesSrc'/>
+ <File Id="file431" Name="PARAME_1.CS" LongName="ParameterTests.cs" src="..\TestSuite\ParameterTests.cs" />
+ <File Id="file432" Name="PERFMO_1.CS" LongName="PerfMonTests.cs" src="..\TestSuite\PerfMonTests.cs" />
+ <File Id="file433" Name="POOLIN_1.CS" LongName="PoolingTests.cs" src="..\TestSuite\PoolingTests.cs" />
+ <File Id="file434" Name="PREPAR_1.CS" LongName="PreparedStatements.cs" src="..\TestSuite\PreparedStatements.cs" />
+ <File Id="file435" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\TestSuite\StoredProcedure.cs" />
+ <File Id="file436" Name="STRESS_1.CS" LongName="StressTests.cs" src="..\TestSuite\StressTests.cs" />
+ <File Id="file437" Name="Syntax.cs" src="..\TestSuite\Syntax.cs" />
+ <File Id="file438" Name="THREAD_1.CS" LongName="Threading.cs" src="..\TestSuite\Threading.cs" />
+ <File Id="file439" Name="TRANSA_1.CS" LongName="Transactions.cs" src="..\TestSuite\Transactions.cs" />
+ <File Id="file440" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\TestSuite\UsageAdvisor.cs" />
+ <File Id="file441" Name="Utils.cs" src="..\TestSuite\Utils.cs" />
+ <File Id="file442" Name="Simple_1.cs" LongName="SimpleTransactions.cs" src="..\TestSuite\SimpleTransactions.cs"/>
+ <File Id="file443" Name="Timeou_1.cs" LongName="TimeoutAndCancel.cs" src="..\TestSuite\TimeoutAndCancel.cs"/>
+ <File Id="file444" Name="Syntax2.cs" src="..\TestSuite\Syntax2.cs"/>
+ <File Id="file445" Name="CONNEC_2.cs" LongName="ConnectionStringBuilder.cs" src="..\TestSuite\ConnectionStringBuilder.cs"/>
+ </Component>
+ <Directory Id="TSProperties" Name="tsp" LongName="Properties">
+ <Component Id="TestSuitePropSrc" DiskId="1" Guid="F06B71B0-B607-4dba-BFB3-A1900959FBCF">
+ <File Id="file401" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\TestSuite\Properties\AssemblyInfo.cs" />
+ </Component>
+ </Directory>
+ </Directory>
+ </DirectoryRef>
+
+ <Feature Id='Sources' Level='1' Title='Sources' Description='Source code for all assemblies'>
+ <ComponentRef Id='TopLevelSrc'/>
+ <ComponentRef Id='ClientSrc'/>
+ <ComponentRef Id='CommonSrc'/>
+ <ComponentRef Id='DocsSrc'/>
+ <ComponentRef Id='TypesSrc'/>
<ComponentRef Id='ZLibSrc'/>
- <ComponentRef Id='TestSuiteSrc'/>
- </Feature>
-
- </Fragment>
-</Wix>
+ <ComponentRef Id='TestSuiteSrc'/>
+ <ComponentRef Id='TestSuitePropSrc'/>
+ </Feature>
+
+ </Fragment>
+</Wix>
Modified: trunk/Package.build
===================================================================
--- trunk/Package.build 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/Package.build 2006-11-06 21:06:23 UTC (rev 455)
@@ -90,10 +90,9 @@
<property name="debug" value="false"/>
<property name="build.dir" value="staging" />
-<!-- <nant buildfile="staging/Client.build" target="allframeworks"/>-->
- <nant buildfile="staging/Client.build" target="net-2.0"/>
+ <nant buildfile="staging/Client.build" target="allframeworks"/>
- <!-- now build the WIX installer -->
+ <!-- now build the WIX installer -->
<exec workingdir="staging/Installer" program="candle" commandline="-dIsGPL=${IsGPL} -dbuild=release main.wxs"/>
<exec workingdir="staging/Installer" program="candle" commandline="samples.wxs"/>
<exec workingdir="staging/Installer" program="candle" commandline="sources.wxs"/>
Modified: trunk/README
===================================================================
--- trunk/README 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/README 2006-11-06 21:06:23 UTC (rev 455)
@@ -1,4 +1,4 @@
-MySQL Connector/Net 5.0.1
+MySQL Connector/Net 5.0.2
MySQL AB's ADO.Net Driver for MySQL
Copyright (c) 2004-2006 MySQL AB
Modified: trunk/Release Notes.txt
===================================================================
--- trunk/Release Notes.txt 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/Release Notes.txt 2006-11-06 21:06:23 UTC (rev 455)
@@ -1,7 +1,7 @@
-Connector/Net 5.0.1 Release Notes
+Connector/Net 5.0.2 Release Notes
------------------------------------
-Welcome to the release notes for Connector/Net 5.0.1.
+Welcome to the release notes for Connector/Net 5.0.2.
This version of the connector incorporates many changes to its internal structure that
will provide both increased speed and flexibility. Speed is increased by allowing column
@@ -12,13 +12,10 @@
Many more features have been added to this version including Usage Advisor, PerfMon hooks,
asynchronous queries, and full ADO.net 2.0 support.
-This is the second release of the connector and many things that were broken in the first
+This is the third release of the connector and many things that were broken in the first
release have been fixed. Below is the list of what was listed as missing or incomplete
in the first release and their current status.
-* CommandTimeout support
-This works but does contain some bugs.
-
* System.Transaction support
This has been implemented however DTC elevation does not work. There are also some
open bugs against this feature.
@@ -28,16 +25,8 @@
the documentation. Look for improvements in the coming releases.
* Load data local infile
-This still is not working but will be fixed in 5.0.2
+This is now fixed and working.
-* Compression protocol
-This now works as expected. We have also removed the use of the ICSharpCode zib library and
-replaced it with a C# version of zlib.
-
-* Shared memory protocol
-This now works as expected.
-
-
.NET 1.0 and 1.1 binaries not included
--------------------------------------
This release only ships with a .NET 2.0 compiled binary. The reason for this is because
@@ -50,8 +39,8 @@
Mono support
------------
-We are currently evaluating Mono support for ADO.Net 2.0 and will be including Mono support,
-if possible, in the next beta release.
+We are currently evaluating Mono support for ADO.Net 2.0 and will be including fully tested
+Mono support in an upcoming release.
Functionality changes
---------------------
@@ -75,4 +64,7 @@
values and you need to retrieve them, you can either handcraft the update statement or
refill your table or dataset.
+* MySqlCommandBuilder also no longer supports updating datasets and datatables where the user
+ has specified a custom value for an autoincrement field. This is a limitation of .NET 2.0.
+
Modified: trunk/TestSuite/Properties/AssemblyInfo.cs
===================================================================
--- trunk/TestSuite/Properties/AssemblyInfo.cs 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/TestSuite/Properties/AssemblyInfo.cs 2006-11-06 21:06:23 UTC (rev 455)
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.0.1")]
+[assembly: AssemblyVersion("5.0.2")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/mysqlclient/AssemblyInfo.cs
===================================================================
--- trunk/mysqlclient/AssemblyInfo.cs 2006-11-02 21:04:23 UTC (rev 454)
+++ trunk/mysqlclient/AssemblyInfo.cs 2006-11-06 21:06:23 UTC (rev 455)
@@ -50,7 +50,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.0.1")]
+[assembly: AssemblyVersion("5.0.2")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
| Thread |
|---|
| • Connector/NET commit: r455 - in trunk: . Installer TestSuite/Properties mysqlclient | rburnett | 6 Nov |
