Added:
trunk/Installer/MachineConfig.js
Modified:
trunk/Installer/main.wxs
trunk/Installer/samples.wxs
trunk/Installer/sources.wxs
trunk/Package.build
trunk/mysqlclient/common/SharedMemoryStream.cs
trunk/mysqlclient/docs/MySqlDataReader.xml
trunk/mysqlclient/zlib/SupportClass.cs
Log:
1. cleaned up some compiler warnings
2. added MachineConfig.js to the installation. Now the installer will add the provider to machine.config on install and remove on Uninstall
3. update guids in main.wxs
Added: trunk/Installer/MachineConfig.js
===================================================================
--- trunk/Installer/MachineConfig.js 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/Installer/MachineConfig.js 2006-09-29 21:51:57 UTC (rev 375)
@@ -0,0 +1,262 @@
+// Launched during installation
+function InstallMachineConfig()
+{
+ DoAllJob("Install");
+}
+
+// Launched during deinstalation
+function UninstallMachineConfig()
+{
+ DoAllJob("Uninstall");
+}
+
+// Does all job
+function DoAllJob(action)
+{
+ // Init log
+ var log = InitLog();
+ WriteLineToLog(log, "Initializing installation.");
+ WriteLineToLog(log, "Action is " + action);
+
+
+ // Get framework root
+ var frameworkRoot = GetFrameworkRoot(log);
+ if( frameworkRoot == null )
+ {
+ WriteLineToLog("Failed to get framework root!");
+ return;
+ }
+ WriteLineToLog(log, "Framework root: " + frameworkRoot);
+
+ // Get 2.0 path
+ var machineConfig = GetMachineConfigPath(log, frameworkRoot);
+ if( machineConfig == null )
+ {
+ WriteLineToLog("Failed to get machine.config path!");
+ return;
+ }
+ WriteLineToLog(log, "machine.config path: " + machineConfig);
+
+ // Perform main task
+ MainOperation(log, machineConfig, action);
+
+ // Close log
+ CloseLog(log);
+}
+
+// Returns machine.config path
+function GetMachineConfigPath(log, root)
+{
+ try
+ {
+ // Create fso
+ var fso, f, fc, s;
+ fso = new ActiveXObject("Scripting.FileSystemObject");
+ if(fso == null)
+ {
+ WriteLineToLog(log, "Failed to get FSO!");
+ return null;
+ }
+
+ // Get root information
+ f = fso.GetFolder(root);
+ if(fso == null)
+ {
+ WriteLineToLog(log, "Failed to get information about framework root!");
+ return null;
+ }
+
+ // Enumerate subfolders
+ fc = new Enumerator(f.SubFolders);
+ if(fc == null)
+ {
+ WriteLineToLog(log, "Failed to enumerate framework root subfolders!");
+ return null;
+ }
+
+ // Search for v2.0.... subfolder
+ for (; !fc.atEnd(); fc.moveNext())
+ {
+ if( fc.item().Name.indexOf("v2.0.") == 0)
+ {
+ // Extract config name and check for existence
+ var result = root + fc.item().Name + "\\CONFIG\\machine.config";
+ if( fso.FileExists(result) )
+ return result;
+ else
+ WriteLineToLog(log, "File " + result + " doesn't exists.");
+ }
+ }
+
+ WriteLineToLog(log, "v2.0 subfolder not founded!");
+ return null;
+ }
+ catch(e)
+ {
+ WriteLineToLog(log, "Failed to get framework root because of exception!");
+ return null;
+ }
+}
+
+// Returns .NET frameworks root directory
+function GetFrameworkRoot(log)
+{
+ try
+ {
+ var WshShell = new ActiveXObject("WScript.Shell");
+ if( WshShell == null )
+ {
+ WriteLineToLog(log, "Failed to create WScript.Shell!");
+ return null;
+ }
+ WriteLineToLog("reading framework root from registry");
+ return WshShell.RegRead ("HKLM\\Software\\Microsoft\\.NETFramework\\InstallRoot");
+ }
+ catch(e)
+ {
+ WriteLineToLog(log, "Failed to get framework root because of exception!");
+ return null;
+ }
+}
+
+// Initializes log file on disk C
+function InitLog()
+{
+ try
+ {
+ var fso = new ActiveXObject("Scripting.FileSystemObject");
+ return fso.CreateTextFile("c:\\mysqlddexinstall.txt", true);
+ }
+ catch(e)
+ {
+ return null;
+ }
+}
+
+// Writes text to log
+function WriteToLog(log, line)
+{
+ try
+ {
+ if( log != null )
+ log.Write(line);
+ }
+ catch(e)
+ {
+ }
+}
+
+// Writes line to log
+function WriteLineToLog(log, line)
+{
+ try
+ {
+ if( log != null )
+ log.WriteLine(line);
+ }
+ catch(e)
+ {
+ }
+}
+
+// Closes log file on disk C
+function CloseLog(log)
+{
+ try
+ {
+ if( log != null )
+ log.Close();
+ }
+ catch(e)
+ {
+ return null;
+ }
+}
+
+// Performs main operation - alters machine.config
+function MainOperation(log, machineConfigPath, action)
+{
+ var invariantName = "MySql.Data.MySqlClient";
+
+ try
+ {
+ // Create DOM object
+ var config = new ActiveXObject("Msxml2.DOMDocument");
+ if( config == null )
+ {
+ WriteLineToLog(log, "Failed to create XML document!");
+ return;
+ }
+ WriteLineToLog(log, "XML document created.");
+
+ // Load machine config
+ config.load(machineConfigPath);
+ WriteLineToLog(log, "XML document loaded.");
+
+ // Locate list of factpries
+ var factoriesList = config.getElementsByTagName("DbProviderFactories");
+ if( factoriesList == null || factoriesList.length <= 0 && factoriesList[0] == null )
+ {
+ WriteLineToLog(log, "Factories list is empty!");
+ return;
+ }
+ WriteLineToLog(log, "Factories read.");
+
+ // Modify list if it is founded
+ var existEntry = GetExistsEntry(factoriesList[0], invariantName);
+ WriteLineToLog(log, "Search for existed entry completed.");
+
+ // Uninstall if installed
+ if( action == "Uninstall" && existEntry != null )
+ {
+ WriteLineToLog(log, "Removing exists entry...");
+ factoriesList[0].removeChild(existEntry);
+ WriteLineToLog(log, "Existing entry removed.");
+ }
+
+ // Install if not installed
+ if( action == "Install" && existEntry == null )
+ {
+ WriteLineToLog(log, "Creating new entry...");
+ var newEntry = config.createElement("add");
+ if(newEntry == null)
+ {
+ WriteLineToLog(log, "Factories to create new entry!");
+ return;
+ }
+ WriteLineToLog(log, "New entry created.");
+
+ WriteLineToLog(log, "Filling attributes...");
+ newEntry.setAttribute("name", "MySQL Data Provider");
+ newEntry.setAttribute("invariant", invariantName);
+ newEntry.setAttribute("description", ".Net Framework Data Provider for MySQL");
+ newEntry.setAttribute("type", "MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data");
+ WriteLineToLog(log, "Attributes are filled.");
+
+ WriteLineToLog(log, "Appending entry...");
+ factoriesList[0].appendChild(newEntry);
+ WriteLineToLog(log, "New entry appended.");
+ }
+
+ // Save changes
+ WriteLineToLog(log, "Saving changes...");
+ config.save(machineConfigPath);
+ WriteLineToLog(log, "machine.config succesfully saved.");
+
+ }
+ catch(e)
+ {
+ WriteLineToLog(log, "Failed to perform main task because of exception!");
+ }
+}
+
+// Searches for existing provider entry
+function GetExistsEntry(factoriesList, invariantName)
+{
+ for(i = 0; i < factoriesList.childNodes.length; i++ )
+ {
+ if( factoriesList.childNodes[i].getAttribute("invariant") == invariantName )
+ return factoriesList.childNodes[i];
+ }
+ return null;
+}
\ No newline at end of file
Modified: trunk/Installer/main.wxs
===================================================================
--- trunk/Installer/main.wxs 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/Installer/main.wxs 2006-09-29 21:51:57 UTC (rev 375)
@@ -2,9 +2,9 @@
<?define ProductVersion="5.0.1"?>
<?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
- <Product Id="796B0557-FB78-4d62-91DD-B0EB1B5BDC33" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
+ <Product Id="b6b832e4-5bcb-4030-8cb7-d05eefd0e950" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
- <Package Id="????????-????-????-????-????????????" Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
+ <Package Id="2401da2d-92c6-49ac-a3e5-c3ac7b89bf45" 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="796B0557-FB78-4d62-91DD-B0EB1B5BDC33" DiskId="1">
+ <Component Id="BaseComponents" Guid="572845ef-138a-40d0-be9f-5a98b415f83e" 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,19 +49,19 @@
<!-- .Net 2.0 Binaries -->
<DirectoryRef Id='BinNet20'>
- <Component Id="Net20" Guid="6462e5d1-a7b0-4020-a110-5d15bf518309">
+ <Component Id="Net20" Guid="529dc176-92d0-4f14-ab09-25f611ce2959">
<File Id="CoreBin20" Name="MD20" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" 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>
+<!-- <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="e0685a46-8c07-41eb-8155-77c109cb5a1d">
+ <Component Id="StartMenuComponent" Guid="1ee0b5b1-91b2-4acf-b17b-98608f6f4d15">
<Condition><![CDATA[CREATESTARTMENU="1"]]></Condition>
<Shortcut Id="S100" Name="Docs" LongName="Documentation"
Description="Complete documentation for the connector"
@@ -75,7 +75,7 @@
</DirectoryRef>
<DirectoryRef Id='DocsDir'>
- <Component Id="Docs" Guid="62b88612-0ce5-4ecb-bae2-b84ceb4d3229">
+ <Component Id="Docs" Guid="bdb99782-9ac0-4ca5-827c-c54cb53bd779">
<File Id="CoreCHM" Name="Docs" LongName="MySql.Data.chm" src="..\doc\MySql.Data.chm" DiskId="1" />
</Component>
</DirectoryRef>
@@ -113,5 +113,20 @@
<UIRef Id="WixUI_Mondo"/>
<Icon Id="ChangeLogIcon" src="Bitmaps\document.ico"/>
- </Product>
+
+
+ <Binary Id="MachineConfig" src='MachineConfig.js' />
+ <CustomAction Id="InstallMachineConfig" BinaryKey="MachineConfig" JScriptCall='InstallMachineConfig'/>
+ <CustomAction Id="ReinstallMachineConfig" BinaryKey="MachineConfig" JScriptCall='InstallMachineConfig'/>
+ <CustomAction Id="UninstallMachineConfig" BinaryKey="MachineConfig" JScriptCall='UninstallMachineConfig'/>
+
+ <InstallExecuteSequence>
+ <Custom Action='InstallMachineConfig' After='InstallFinalize'>NOT Installed</Custom>
+ <Custom Action='UninstallMachineConfig' Before='ProcessComponents'>Installed</Custom>
+ <Custom Action='ReinstallMachineConfig' Before='ProcessComponents'>(&Complete<>2) AND (!Complete=3)</Custom>
+ </InstallExecuteSequence>
+ </Product>
</Wix>
+
+
+
Modified: trunk/Installer/samples.wxs
===================================================================
--- trunk/Installer/samples.wxs 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/Installer/samples.wxs 2006-09-29 21:51:57 UTC (rev 375)
@@ -4,7 +4,7 @@
<DirectoryRef Id='SampleDir'>
<Directory Id="TableEditor" Name="teditor" LongName="Table Editor">
<Directory Id="teCS" Name="cs">
- <Component Id="Sample1CS" Guid="1c6044bb-0ff4-4e51-b301-6a64dcdf084c">
+ <Component Id="Sample1CS" Guid="392909ac-7967-4a5c-a836-ad37fd41cf63">
<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="1c6044bb-0ff4-4e51-b301-6a64dcdf084c">
+ <Component Id="Sample1VB" Guid="6b14a3cd-46a7-43eb-ab3c-5a00c3f53fd9">
<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="1c6044bb-0ff4-4e51-b301-6a64dcdf084c">
+ <Component Id="Sample2CS" Guid="a2e90c88-f822-4bce-bc21-c9e2d3509632">
<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-09-29 18:55:33 UTC (rev 374)
+++ trunk/Installer/sources.wxs 2006-09-29 21:51:57 UTC (rev 375)
@@ -2,7 +2,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
<Fragment Id='SourceFragment'>
<DirectoryRef Id='SourceDir'>
- <Component Id="TopLevelSrc" Guid="431c9afa-babe-4483-8a75-b68264c52d2a">
+ <Component Id="TopLevelSrc" Guid="f1c97712-f21c-4a1a-9c3b-37fd42163a3f">
<File Id="nantFile" Name="client.bld" LongName="client.build" src="..\client.build" DiskId="1"/>
</Component>
<Directory Id="clientFolder" Name="msc" LongName="MySqlClient">
@@ -36,7 +36,7 @@
<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="PreparedStatement.cs" src="..\mysqlclient\PreparedStatement.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="file37" Name="SCHEMA_1.CS" LongName="SchemaProvider.cs" src="..\mysqlclient\SchemaProvider.cs" />
@@ -46,7 +46,7 @@
<File Id="file41" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\mysqlclient\UsageAdvisor.cs" />
</Component>
<Directory Id="commonFolder" Name="Common">
- <Component Id="CommonSrc" DiskId="1" Guid="88ed3210-b947-4536-9d31-aeb9fcab2316">
+ <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" />
@@ -60,7 +60,7 @@
</Component>
</Directory>
<Directory Id="docSrcFolder" Name="Docs">
- <Component Id="DocsSrc" DiskId="1" Guid="212bf5d7-db43-411d-9abc-ba4e54017abf">
+ <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" />
@@ -75,7 +75,7 @@
</Component>
</Directory>
<Directory Id="typesFolder" Name="Types">
- <Component Id="TypesSrc" DiskId="1" Guid="bf2429da-2580-4b4b-8232-455dfe336576">
+ <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" />
@@ -98,7 +98,7 @@
</Component>
</Directory>
<Directory Id="zlibFolder" Name="zlib">
- <Component Id="ZLibSrc" DiskId="1" Guid="bf2429da-2580-4b4b-8232-455dfe336576">
+ <Component Id="ZLibSrc" DiskId="1" Guid="04b8a7f1-c402-4b97-b784-7ac5fb1154ed">
<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" />
@@ -117,7 +117,7 @@
</Directory>
</Directory>
<Directory Id="TestSuite" Name="ts" LongName="TestSuite">
- <Component Id="TestSuiteSrc" DiskId="1" Guid="a17ca97f-1704-4b50-85e6-d9e727af64fe">
+ <Component Id="TestSuiteSrc" DiskId="1" Guid="cfe61742-5d9d-452b-9b12-f8adb012bbb4">
<File Id="file400" Name="APP_1.CON" LongName="App.config" src="..\TestSuite\App.config" />
<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" />
@@ -164,6 +164,7 @@
<ComponentRef Id='CommonSrc'/>
<ComponentRef Id='DocsSrc'/>
<ComponentRef Id='TypesSrc'/>
+ <ComponentRef Id='ZLibSrc'/>
<ComponentRef Id='TestSuiteSrc'/>
</Feature>
Modified: trunk/Package.build
===================================================================
--- trunk/Package.build 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/Package.build 2006-09-29 21:51:57 UTC (rev 375)
@@ -95,7 +95,7 @@
<exec workingdir="staging/Installer" program="candle" commandline="samples.wxs"/>
<exec workingdir="staging/Installer" program="candle" commandline="sources.wxs"/>
<exec workingdir="staging/Installer" program="light"
- commandline='main.wixobj samples.wixobj sources "${WIXPATH}/WixUI.wixlib" -loc "${WIXPATH}/WixUI_en-us.wxl" -out MySql.Data.msi'/>
+ commandline='main.wixobj samples.wixobj sources.wixobj "${wix.dir}/WixUI.wixlib" -loc "${wix.dir}/WixUI_en-us.wxl" -out MySql.Data.msi'/>
<zip zipfile="packages/mysql-connector-net-${ver}${postfix}.zip">
<fileset basedir="staging/Installer"><include name="MySql.Data.msi"/></fileset>
@@ -111,12 +111,12 @@
</zip>
<!-- now add the MD5 sig -->
- <checksum algorithm="MD5" fileext="MD5">
+<!-- <checksum algorithm="MD5" fileext="MD5">
<fileset>
<include name="packages/mysql-connector-net-${ver}${postfix}.zip"/>
<include name="packages/mysql-connector-net-${ver}${postfix}-noinstall.zip"/>
</fileset>
- </checksum>
+ </checksum>-->
</target>
Modified: trunk/mysqlclient/common/SharedMemoryStream.cs
===================================================================
--- trunk/mysqlclient/common/SharedMemoryStream.cs 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/mysqlclient/common/SharedMemoryStream.cs 2006-09-29 21:51:57 UTC (rev 375)
@@ -45,12 +45,12 @@
private int position;
private int connectNumber;
- private uint SYNCHRONIZE = 0x00100000;
- private uint READ_CONTROL = 0x00020000;
- private uint EVENT_MODIFY_STATE = 0x2;
- private uint EVENT_ALL_ACCESS = 0x001F0003;
- private uint FILE_MAP_WRITE = 0x2;
- private int BUFFERLENGTH = 16004;
+ private const uint SYNCHRONIZE = 0x00100000;
+ private const uint READ_CONTROL = 0x00020000;
+ private const uint EVENT_MODIFY_STATE = 0x2;
+ private const uint EVENT_ALL_ACCESS = 0x001F0003;
+ private const uint FILE_MAP_WRITE = 0x2;
+ private const int BUFFERLENGTH = 16004;
public SharedMemoryStream(string memName)
{
Modified: trunk/mysqlclient/docs/MySqlDataReader.xml
===================================================================
--- trunk/mysqlclient/docs/MySqlDataReader.xml 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/mysqlclient/docs/MySqlDataReader.xml 2006-09-29 21:51:57 UTC (rev 375)
@@ -131,7 +131,7 @@
MySql allows date columns to contain the value '0000-00-00' and datetime
columns to contain the value '0000-00-00 00:00:00'. The DateTime structure cannot contain
or represent these values. To read a datetime value from a column that might
- contain zero values, use <see cref="GetMySqlDateTime"/>.
+ contain zero values, use <see cref="GetMySqlDateTime(int)"/>.
</para>
<para>
The behavior of reading a zero datetime column using this method is defined by the
Modified: trunk/mysqlclient/zlib/SupportClass.cs
===================================================================
--- trunk/mysqlclient/zlib/SupportClass.cs 2006-09-29 18:55:33 UTC (rev 374)
+++ trunk/mysqlclient/zlib/SupportClass.cs 2006-09-29 21:51:57 UTC (rev 375)
@@ -1,9 +1,6 @@
-
using System;
-/// <summary>
-/// Contains conversion support elements such as classes, interfaces and static methods.
-/// </summary>
+/* Contains conversion support elements such as classes, interfaces and static methods. */
namespace zlib
{
public class SupportClass
@@ -183,7 +180,7 @@
/// <summary>
/// Writes an object to the specified BinaryWriter
/// </summary>
- /// <param name="stream">The target BinaryWriter</param>
+ /// <param name="binaryWriter">The target BinaryWriter</param>
/// <param name="objectToSend">The object to be sent</param>
public static void Serialize(System.IO.BinaryWriter binaryWriter, System.Object objectToSend)
{
| Thread |
|---|
| • Connector/NET commit: r375 - in trunk: . Installer mysqlclient/common mysqlclient/docs mysqlclient/zlib | rburnett | 29 Sep |
