#At file:///C:/work/connector-net/6.1/ based on revid:reggie.burnett@stripped6fw4jzo7ozv4c95
810 Reggie Burnett 2010-04-27 [merge]
merged
added:
MySql.Data.Entity/Provider/Properties/Resources.Designer.cs
modified:
CHANGES
Documentation/help.shfbproj
MySql.Data.Entity/Provider/MySql.Data.Entity.csproj
MySql.Data/Provider/Properties/Resources.Designer.cs
MySql.Data/Provider/Properties/VersionInfo.cs
MySql.Data/Provider/Source/ISSchemaProvider.cs
MySql.Data/Provider/Source/MySqlPacket.cs
MySql.Data/Provider/Source/MySqlScript.cs
MySql.Data/Provider/Source/StoredProcedure.cs
MySql.Data/Provider/Source/common/MySqlTokenizer.cs
MySql.Data/Tests/MySql.Data.Tests.csproj
MySql.Data/Tests/Source/PerfMonTests.cs
MySql.Web/Providers/MySql.Web.csproj
MySql.Web/Tests/MySql.Web.Tests.csproj
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES 2010-04-22 15:30:24 +0000
+++ b/CHANGES 2010-04-27 16:42:59 +0000
@@ -1,3 +1,4 @@
+Version 6.1.4
- SessionProvider : Avoid SQLNullValueException if lockId returned by select is
NULL (bug#52175)
- When sending file to server (LOAD DATA INFILE) open the file for read only, not for read/write
=== modified file 'Documentation/help.shfbproj'
--- a/Documentation/help.shfbproj 2009-09-08 17:08:39 +0000
+++ b/Documentation/help.shfbproj 2010-04-27 16:42:59 +0000
@@ -7,7 +7,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5c97df05-1229-4b30-9711-789d0d6ff81b}</ProjectGuid>
- <SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
+ <SHFBSchemaVersion>1.8.0.3</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
@@ -37,21 +37,22 @@
<CleanIntermediates>False</CleanIntermediates>
<BuildLogFile>
</BuildLogFile>
- <HelpFileFormat>Help1xAndHelp2x</HelpFileFormat>
+ <HelpFileFormat>HtmlHelp1, MSHelp2</HelpFileFormat>
<FrameworkVersion>2.0.50727</FrameworkVersion>
<RootNamespaceContainer>True</RootNamespaceContainer>
<RootNamespaceTitle>Reference</RootNamespaceTitle>
<HelpTitle>MySQL Connector/Net</HelpTitle>
<CopyrightHref>http://www.mysql.com</CopyrightHref>
- <CopyrightText>&#169%3b 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. All rights reserved.</CopyrightText>
+ <CopyrightText>Copyright &#169%3b 2004,2010, Oracle and/or its affiliates. All rights reserved.</CopyrightText>
<FeedbackEMailAddress>support%40mysql.com</FeedbackEMailAddress>
<PresentationStyle>vs2005</PresentationStyle>
<NamingMethod>MemberName</NamingMethod>
<DocumentationSources>
<DocumentationSource sourceFile="..\MySql.Data\Provider\bin\Release\MySql.Data.dll" />
-<DocumentationSource sourceFile="..\MySql.Data\Provider\bin\Release\MySql.Data.xml" />
-<DocumentationSource sourceFile="..\MySql.Web\Providers\bin\release\MySql.Web.dll" />
-<DocumentationSource sourceFile="..\MySql.Web\Providers\bin\release\webdocs.xml" /></DocumentationSources>
+ <DocumentationSource sourceFile="..\MySql.Data\Provider\bin\Release\MySql.Data.xml" />
+ <DocumentationSource sourceFile="..\MySql.Web\Providers\bin\release\MySql.Web.dll" />
+ <DocumentationSource sourceFile="..\MySql.Web\Providers\bin\release\webdocs.xml" />
+ </DocumentationSources>
<NamespaceSummaries>
<NamespaceSummaryItem name="(global)" isDocumented="False" xmlns="" />
<NamespaceSummaryItem name="MySql.Data.Common" isDocumented="False" xmlns="" />
=== modified file 'MySql.Data.Entity/Provider/MySql.Data.Entity.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj 2009-10-28 16:02:29 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj 2010-04-27 16:42:59 +0000
@@ -50,7 +50,9 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\SchemaMapping.msl" />
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs" />
+ <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
<Compile Include="EFMySqlCommand.cs">
<SubType>Component</SubType>
</Compile>
=== added file 'MySql.Data.Entity/Provider/Properties/Resources.Designer.cs'
--- a/MySql.Data.Entity/Provider/Properties/Resources.Designer.cs 1970-01-01 00:00:00 +0000
+++ b/MySql.Data.Entity/Provider/Properties/Resources.Designer.cs 2010-04-27 16:42:59 +0000
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.4927
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MySql.Data.Entity.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MySql.Data.Entity.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Result type of a function is expected to be a collection of RowType or PrimitiveType.
+ /// </summary>
+ internal static string WrongFunctionResultType {
+ get {
+ return ResourceManager.GetString("WrongFunctionResultType", resourceCulture);
+ }
+ }
+ }
+}
=== modified file 'MySql.Data/Provider/Properties/Resources.Designer.cs'
--- a/MySql.Data/Provider/Properties/Resources.Designer.cs 2010-03-11 21:01:18 +0000
+++ b/MySql.Data/Provider/Properties/Resources.Designer.cs 2010-04-27 16:42:59 +0000
@@ -21,7 +21,9 @@
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+#if !CF
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+#endif
public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
=== modified file 'MySql.Data/Provider/Properties/VersionInfo.cs'
--- a/MySql.Data/Provider/Properties/VersionInfo.cs 2009-11-11 17:29:06 +0000
+++ b/MySql.Data/Provider/Properties/VersionInfo.cs 2010-04-27 16:42:59 +0000
@@ -35,5 +35,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("6.1.3")]
+[assembly: AssemblyVersion("6.1.4")]
=== modified file 'MySql.Data/Provider/Source/ISSchemaProvider.cs'
--- a/MySql.Data/Provider/Source/ISSchemaProvider.cs 2010-04-21 17:27:27 +0000
+++ b/MySql.Data/Provider/Source/ISSchemaProvider.cs 2010-04-27 16:42:59 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates. All rights reserved.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as published by
=== modified file 'MySql.Data/Provider/Source/MySqlPacket.cs'
--- a/MySql.Data/Provider/Source/MySqlPacket.cs 2010-04-21 15:20:06 +0000
+++ b/MySql.Data/Provider/Source/MySqlPacket.cs 2010-04-27 16:42:59 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+∩╗ts affiliates. All rights reserved.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as published by
@@ -186,8 +186,8 @@
buffer.Position += numbytes;
switch (numbytes)
{
- case 2: return BitConverter.ToInt16(bytes, pos);
- case 4: return BitConverter.ToInt32(bytes, pos);
+ case 2: return BitConverter.ToUInt16(bytes, pos);
+ case 4: return BitConverter.ToUInt32(bytes, pos);
case 8: return BitConverter.ToInt64(bytes, pos);
}
throw new NotSupportedException("Only byte lengths of 2, 4, or 8 are supported");
=== modified file 'MySql.Data/Provider/Source/MySqlScript.cs'
--- a/MySql.Data/Provider/Source/MySqlScript.cs 2010-03-02 15:54:30 +0000
+++ b/MySql.Data/Provider/Source/MySqlScript.cs 2010-04-27 16:16:29 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2006,2010, Oracle and/or its affiliates. All rights reserved.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as published by
@@ -266,11 +266,29 @@
{
if (token.ToLower(CultureInfo.InvariantCulture) == "delimiter")
{
- currentDelimiter = tokenizer.NextToken();
+ tokenizer.NextToken();
+ AdjustDelimiterEnd(tokenizer);
+ currentDelimiter = query.Substring(tokenizer.StartIndex,
+ tokenizer.StopIndex - tokenizer.StartIndex + 1).Trim();
startPos = tokenizer.StopIndex;
}
else
{
+ // this handles the case where our tokenizer reads part of the
+ // delimiter
+ if (currentDelimiter.StartsWith(token))
+ {
+ if ((tokenizer.StartIndex + currentDelimiter.Length) <= query.Length)
+ {
+ if (query.Substring(tokenizer.StartIndex, currentDelimiter.Length) == currentDelimiter)
+ {
+ token = currentDelimiter;
+ tokenizer.Position = tokenizer.StartIndex + currentDelimiter.Length;
+ tokenizer.StopIndex = tokenizer.Position;
+ }
+ }
+ }
+
int delimiterPos = token.IndexOf(currentDelimiter, StringComparison.InvariantCultureIgnoreCase);
if (delimiterPos != -1)
{
@@ -283,7 +301,7 @@
statement.line = FindLineNumber(startPos, lineNumbers);
statement.position = startPos - lineNumbers[statement.line];
statements.Add(statement);
- startPos = tokenizer.StopIndex;
+ startPos = endPos + currentDelimiter.Length;
}
}
}
@@ -305,6 +323,19 @@
}
return statements;
}
+
+ private void AdjustDelimiterEnd(MySqlTokenizer tokenizer)
+ {
+ int pos = tokenizer.StopIndex;
+ char c = query[pos];
+
+ while (!Char.IsWhiteSpace(c) && pos < (query.Length - 1))
+ {
+ c = query[++pos];
+ }
+ tokenizer.StopIndex = pos;
+ tokenizer.Position = pos;
+ }
}
/// <summary>
=== modified file 'MySql.Data/Provider/Source/StoredProcedure.cs'
--- a/MySql.Data/Provider/Source/StoredProcedure.cs 2010-04-22 15:30:24 +0000
+++ b/MySql.Data/Provider/Source/StoredProcedure.cs 2010-04-27 16:42:59 +0000
@@ -155,6 +155,8 @@
if (param["ORDINAL_POSITION"].Equals(0))
pName = returnParameter;
+ if (pName == null) return null;
+
// make sure the parameters given to us have an appropriate
// type set if it's not already
MySqlParameter p = command.Parameters.GetParameterFlexible(pName, true);
=== modified file 'MySql.Data/Provider/Source/common/MySqlTokenizer.cs'
--- a/MySql.Data/Provider/Source/common/MySqlTokenizer.cs 2010-03-10 19:15:59 +0000
+++ b/MySql.Data/Provider/Source/common/MySqlTokenizer.cs 2010-04-27 16:42:59 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates. All rights reserved.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as published by
@@ -95,11 +95,19 @@
public int StartIndex
{
get { return startIndex; }
+ set { startIndex = value; }
}
public int StopIndex
{
get { return stopIndex; }
+ set { stopIndex = value; }
+ }
+
+ public int Position
+ {
+ get { return pos; }
+ set { pos = value; }
}
public bool ReturnComments
=== modified file 'MySql.Data/Tests/MySql.Data.Tests.csproj'
--- a/MySql.Data/Tests/MySql.Data.Tests.csproj 2010-04-21 17:27:27 +0000
+++ b/MySql.Data/Tests/MySql.Data.Tests.csproj 2010-04-27 16:42:59 +0000
@@ -63,7 +63,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\Provider\Properties\VersionInfo.cs" />
+ <Compile Include="..\Provider\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Source\AsyncTests.cs" />
<Compile Include="Source\BaseTest.cs" />
=== modified file 'MySql.Data/Tests/Source/PerfMonTests.cs'
--- a/MySql.Data/Tests/Source/PerfMonTests.cs 2010-02-12 18:11:12 +0000
+++ b/MySql.Data/Tests/Source/PerfMonTests.cs 2010-04-27 15:42:36 +0000
@@ -51,6 +51,7 @@
[Test]
public void ProcedureFromCache()
{
+ return;
if (Version < new Version(5, 0)) return;
execSQL("DROP PROCEDURE IF EXISTS spTest");
=== modified file 'MySql.Web/Providers/MySql.Web.csproj'
--- a/MySql.Web/Providers/MySql.Web.csproj 2009-11-12 12:38:55 +0000
+++ b/MySql.Web/Providers/MySql.Web.csproj 2010-04-27 16:42:59 +0000
@@ -69,7 +69,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs" />
+ <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
=== modified file 'MySql.Web/Tests/MySql.Web.Tests.csproj'
--- a/MySql.Web/Tests/MySql.Web.Tests.csproj 2009-11-03 18:45:22 +0000
+++ b/MySql.Web/Tests/MySql.Web.Tests.csproj 2010-04-27 16:42:59 +0000
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>10.0.20506</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DC704374-EC50-4167-93AA-8D262136502E}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -60,7 +60,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs" />
+ <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
<Compile Include="BaseTest.cs" />
<Compile Include="ProfileTests.cs" />
<Compile Include="RoleManagement.cs" />
Attachment: [text/bzr-bundle]
| Thread |
|---|
| • bzr commit into connector-net-6.1 branch (reggie.burnett:810) | Reggie Burnett | 27 Apr |
