Connector/NET commit: r516 - in trunk: Installer TestSuite TestSuite/Properties mysqlclient/Properties mysqlclient/core/docs

[rburnett]

Modified:
   trunk/Installer/main.wxs
   trunk/Installer/samples.wxs
   trunk/Installer/sources.wxs
   trunk/TestSuite/Properties/AssemblyInfo.cs
   trunk/TestSuite/Transactions.cs
   trunk/mysqlclient/Properties/AssemblyInfo.cs
   trunk/mysqlclient/core/docs/MySqlConnection.xml
Log:
Transactions.cs - removed test case for Bug 22400 since it is repeated in
SimpleTransactions.cs

The rest of the changes relate to updating the installer component guids and moving the
version number from 5.0.2 to 5.0.3


Modified: trunk/Installer/main.wxs
===================================================================
--- trunk/Installer/main.wxs	2006-12-29 15:37:53 UTC (rev 515)
+++ trunk/Installer/main.wxs	2006-12-29 16:25:08 UTC (rev 516)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?define ProductVersion="5.0.2"?>
+<?define ProductVersion="5.0.3"?>
 <?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Product Id="E9E76B08-5DCB-47d4-B8FD-B8B0FD51932F" Name="$(var.ProductName)"
Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
+	<Product Id="7394c123-cacc-4ad2-82b8-c6992131af08" Name="$(var.ProductName)"
Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
 
-		<Package Id="B1855AEF-1ACC-4c06-AEF8-A6BDCD651598" Compressed="yes"
InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
+		<Package Id="2bb12bc3-ad0f-4ffe-be09-7361268baf8b" 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="EDA8C4DA-432F-4eb5-AED4-A057C2B95BDC"
DiskId="1">
+			<Component Id="BaseComponents" Guid="6cbae281-be1e-4952-8a5d-cb5d1ad799a9"
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,12 +49,12 @@
 			
 		<!-- .Net 2.0 Binaries -->
 		<DirectoryRef Id='BinNet20'>
-			<Component Id="Net20" Guid="BA887AEB-53F3-4a54-AEEF-1E31C58EF0E5">
+			<Component Id="Net20" Guid="1b476514-8bcb-48a1-8b32-e477f520b450">
 				<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="36FCD23F-7319-40ba-9B1C-5C5DDE16C439">
+			<Component Id="GAC20" DiskId="1" Guid="50ec2fb6-f33e-48b8-80da-6ee57124e9ce">
 				<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>
@@ -62,7 +62,7 @@
 
 		<!-- Start menu junk -->
 		<DirectoryRef Id='ShortCutDir'>
-			<Component Id="StartMenuComponent" Guid="E7943593-5115-425c-BD1F-8D341CC50590">
+			<Component Id="StartMenuComponent" Guid="0cd164ab-5f94-4ed3-a7aa-8bbf805a87a0">
 				<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="4F9C3D2F-86C3-44b3-A00B-030DDD2D24D6">
+			<Component Id="Docs" Guid="686fbf13-83a2-4f50-a002-3378328d4740">
 				<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-12-29 15:37:53 UTC (rev 515)
+++ trunk/Installer/samples.wxs	2006-12-29 16:25:08 UTC (rev 516)
@@ -4,7 +4,7 @@
     <DirectoryRef Id='SampleDir'> 
 		<Directory Id="TableEditor" Name="teditor" LongName="Table Editor">
 			<Directory Id="teCS" Name="cs">
-				<Component Id="Sample1CS" Guid="490FB527-A57A-49f8-97F3-8246C4FEC7A9">
+				<Component Id="Sample1CS" Guid="22cbf994-2ffb-4c7c-8538-1f773cd8a2a5">
 					<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="BE0B0319-1DE0-474a-9F75-55D1D00AE355">
+				<Component Id="Sample1VB" Guid="72104075-eff1-4d96-b186-8b0a61e7d858">
 					<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="4F2A9038-8D50-4e5c-AF26-9764F1FF2636">
+          <Component Id="Sample2CS" Guid="1cfb8520-6afd-4979-888b-7dfdf4728219">
             <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-12-29 15:37:53 UTC (rev 515)
+++ trunk/Installer/sources.wxs	2006-12-29 16:25:08 UTC (rev 516)
@@ -2,13 +2,13 @@
 <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">
+      <Component Id="TopLevelSrc" Guid="0b171095-b9cb-4bab-8c0e-4b8e8247bfe0">
         <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">
+        <Component Id="ClientSrc" DiskId="1"
Guid="14ffe0b2-329f-4981-ab1c-1d099ec958fa">
           <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" />
@@ -51,7 +51,7 @@
           <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">
+          <Component Id="CommonSrc"  DiskId="1"
Guid="e5726acb-91cc-4212-8d2b-594bee186f8c">
             <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" />
@@ -65,7 +65,7 @@
           </Component>
         </Directory>
         <Directory Id="docSrcFolder" Name="Docs">
-          <Component Id="DocsSrc" DiskId="1"
Guid="79FCD690-17C5-47a4-854C-C86544F96168">
+          <Component Id="DocsSrc" DiskId="1"
Guid="9fa4a523-7578-4d1e-b682-6383c6663518">
             <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" />
@@ -80,7 +80,7 @@
           </Component>
         </Directory>
         <Directory Id="typesFolder" Name="Types">
-          <Component Id="TypesSrc" DiskId="1"
Guid="A4F10442-785E-46f1-9153-16E8C59C5353">
+          <Component Id="TypesSrc" DiskId="1"
Guid="00026aa3-136d-4379-a8e2-c12c72866890">
             <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" />
@@ -103,7 +103,7 @@
           </Component>
         </Directory>
         <Directory Id="zlibFolder" Name="zlib">
-          <Component Id="ZLibSrc" DiskId="1"
Guid="C03F64B7-034F-44ac-868E-74C96B919CA4">
+          <Component Id="ZLibSrc" DiskId="1"
Guid="5bf41c05-1d57-4a64-b8a6-e0bad6141317">
             <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" />
@@ -122,7 +122,7 @@
         </Directory>
       </Directory>
       <Directory Id="TestSuite" Name="ts" LongName="TestSuite">
-        <Component Id="TestSuiteSrc" DiskId="1"
Guid="E0F549CB-3B88-4bea-9231-23F5FA9317A5">
+        <Component Id="TestSuiteSrc" DiskId="1"
Guid="54eddace-adcc-44eb-bc25-eb69cbf278d3">
           <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" />
@@ -163,7 +163,7 @@
           <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">
+          <Component Id="TestSuitePropSrc" DiskId="1"
Guid="45741f34-56c0-4186-aeb2-7218210bed7d">
             <File Id="file401" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs"
src="..\TestSuite\Properties\AssemblyInfo.cs" />
           </Component>
         </Directory>

Modified: trunk/TestSuite/Properties/AssemblyInfo.cs
===================================================================
--- trunk/TestSuite/Properties/AssemblyInfo.cs	2006-12-29 15:37:53 UTC (rev 515)
+++ trunk/TestSuite/Properties/AssemblyInfo.cs	2006-12-29 16:25:08 UTC (rev 516)
@@ -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.2")]
+[assembly: AssemblyVersion("5.0.3")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: trunk/TestSuite/Transactions.cs
===================================================================
--- trunk/TestSuite/Transactions.cs	2006-12-29 15:37:53 UTC (rev 515)
+++ trunk/TestSuite/Transactions.cs	2006-12-29 16:25:08 UTC (rev 516)
@@ -142,32 +142,6 @@
         }
 
 #endif
-        /// <summary>
-        /// Bug #22400 Nested transactions 
-        /// </summary>
-        [Category("NotWorking")]
-        [Test]
-        public void NestedTransactions()
-        {
-            MySqlTransaction t1 = conn.BeginTransaction();
-            try
-            {
-                MySqlTransaction t2 = conn.BeginTransaction();
-                t2.Rollback();
-                Assert.Fail("Exception should have been thrown");
-            }
-            catch (NotSupportedException)
-            {
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
-            finally 
-            {
-                t1.Rollback();
-            }
-        }
 
         /// <summary
         /// Bug #22042 mysql-connector-net-5.0.0-alpha BeginTransaction 

Modified: trunk/mysqlclient/Properties/AssemblyInfo.cs
===================================================================
--- trunk/mysqlclient/Properties/AssemblyInfo.cs	2006-12-29 15:37:53 UTC (rev 515)
+++ trunk/mysqlclient/Properties/AssemblyInfo.cs	2006-12-29 16:25:08 UTC (rev 516)
@@ -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.2")]
+[assembly: AssemblyVersion("5.0.3")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: trunk/mysqlclient/core/docs/MySqlConnection.xml
===================================================================
--- trunk/mysqlclient/core/docs/MySqlConnection.xml	2006-12-29 15:37:53 UTC (rev 515)
+++ trunk/mysqlclient/core/docs/MySqlConnection.xml	2006-12-29 16:25:08 UTC (rev 516)
@@ -355,7 +355,9 @@
 		<see cref="MySqlTransaction.Rollback"/> method.
 		<note>If you do not specify an isolation level, the default isolation level is
used. To specify an isolation 
 		level with the <see cref="BeginTransaction()"/> method, use the overload that
takes the <I>iso</I> parameter.
-		</note></para>
+      Also note that any attempt to begin a transaction while a transaction is in
progress will throw an exception on MySQL 4.1 and higher.
+      On MySQL 4.0, an exception will not be thrown because servers 4.0 and earlier did
not report their transacation status.
+    </note></para>
 	</remarks>
 	<example>
 		The following example creates a <see cref="MySqlConnection"/> and a