Modified:
branches/5.2/CHANGES
branches/5.2/Installer/VS2005_Registry.wxi
branches/5.2/Installer/VS2008_Registry.wxi
branches/5.2/MySQLClient.sln
branches/5.2/MySql.Data/Provider/Source/Statement.cs
branches/5.2/MySql.Data/Tests/Source/PerfMonTests.cs
branches/5.2/MySql.Data/Tests/Source/PreparedStatements.cs
branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs
branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs
branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs
branches/5.2/Package.build
Log:
just a little tidying up for the release of 5.2.4
Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/CHANGES 2008-11-11 21:58:18 UTC (rev 1449)
@@ -1,4 +1,4 @@
-Version 5.2.4 -
+Version 5.2.4 - 11/11/2008 (Happy Birthday to me!)
- fixed web providers autogenerateschema option where it would fail if no schema is
present at all (bug #39072)
- backported fix for lingering problem related to bug #37239. If two columns had the same name but
Modified: branches/5.2/Installer/VS2005_Registry.wxi
===================================================================
--- branches/5.2/Installer/VS2005_Registry.wxi 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/Installer/VS2005_Registry.wxi 2008-11-11 21:58:18 UTC (rev 1449)
@@ -10,7 +10,7 @@
<RegistryValue Value="MySql.Data.VisualStudio.MySqlDataProviderPackage, MySql.VisualStudio, Version=$(var.Version), Culture=neutral, PublicKeyToken=null" Type="string"/>
<RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
<RegistryValue Name="Class" Value="MySql.Data.VisualStudio.MySqlDataProviderPackage" Type="string" />
- <RegistryValue Name="Assembly" Value="MySql.VisualStudio, Version=$(var.Version), Culture=neutral, PublicKeyToken=null" Type="string" />
+ <RegistryValue Name="CodeBase" Value="[#MySQL.VisualStudio]" Type="string"/>
<RegistryValue Name="ID" Value="100" Type="integer" />
<RegistryValue Name="MinEdition" Value="Standard" Type="string" />
<RegistryValue Name="ProductVersion" Value="1.0" Type="string" />
Modified: branches/5.2/Installer/VS2008_Registry.wxi
===================================================================
--- branches/5.2/Installer/VS2008_Registry.wxi 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/Installer/VS2008_Registry.wxi 2008-11-11 21:58:18 UTC (rev 1449)
@@ -10,7 +10,7 @@
<RegistryValue Value="MySql.Data.VisualStudio.MySqlDataProviderPackage, MySql.VisualStudio, Version=$(var.Version), Culture=neutral, PublicKeyToken=null" Type="string"/>
<RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
<RegistryValue Name="Class" Value="MySql.Data.VisualStudio.MySqlDataProviderPackage" Type="string" />
- <RegistryValue Name="Assembly" Value="MySql.VisualStudio, Version=$(var.Version), Culture=neutral, PublicKeyToken=null" Type="string" />
+ <RegistryValue Name="CodeBase" Value="[#MySQL.VisualStudio]" Type="string"/>
<RegistryValue Name="ID" Value="100" Type="integer" />
<RegistryValue Name="MinEdition" Value="Standard" Type="string" />
<RegistryValue Name="ProductVersion" Value="1.0" Type="string" />
Modified: branches/5.2/MySQLClient.sln
===================================================================
--- branches/5.2/MySQLClient.sln 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySQLClient.sln 2008-11-11 21:58:18 UTC (rev 1449)
@@ -15,8 +15,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Commercial|Any CPU = Commercial|Any CPU
@@ -213,32 +211,6 @@
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|x64
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.Build.0 = Release|x64
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|x64
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.ActiveCfg = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.Build.0 = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.ActiveCfg = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.Build.0 = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x64.ActiveCfg = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.Build.0 = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.Build.0 = Commercial|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/5.2/MySql.Data/Provider/Source/Statement.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Statement.cs 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySql.Data/Provider/Source/Statement.cs 2008-11-11 21:58:18 UTC (rev 1449)
@@ -184,29 +184,6 @@
}
}
- /// <summary>
- /// We use a separate method here because we want to support using parameter
- /// names with and without a leading marker but we don't want the indexing
- /// methods of MySqlParameterCollection to support that.
- /// </summary>
- /// <param name="parameters"></param>
- /// <param name="name"></param>
- /// <returns></returns>
-/* private MySqlParameter GetParameter(MySqlParameterCollection parameters, string name)
- {
- MySqlParameter parameter = parameters.GetParameterFlexible(name, false);
- int index = parameters.IndexOf(name);
- if (index == -1)
- {
- name = name.Substring(1);
- index = Parameters.IndexOf(name);
- if (index == -1)
- return null;
- }
- return parameters[index];
- }
- */
-
protected virtual bool ShouldIgnoreMissingParameter(string parameterName)
{
if (Connection.Settings.AllowUserVariables)
Modified: branches/5.2/MySql.Data/Tests/Source/PerfMonTests.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/PerfMonTests.cs 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySql.Data/Tests/Source/PerfMonTests.cs 2008-11-11 21:58:18 UTC (rev 1449)
@@ -53,7 +53,7 @@
[Test]
public void ProcedureFromCache()
{
- return;
+#if false
if (version < new Version(5, 0)) return;
execSQL("DROP PROCEDURE IF EXISTS spTest");
@@ -82,6 +82,7 @@
Assert.AreEqual(hardCount, hardQuery.RawValue);
Assert.AreEqual(softCount + 1, softQuery.RawValue);
+#endif
}
}
Modified: branches/5.2/MySql.Data/Tests/Source/PreparedStatements.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/PreparedStatements.cs 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySql.Data/Tests/Source/PreparedStatements.cs 2008-11-11 21:58:18 UTC (rev 1449)
@@ -841,8 +841,7 @@
ReadNegativeTime(false);
}
- [Test]
- public void NegativeTime(bool prepared)
+ private void NegativeTime(bool prepared)
{
execSQL("DROP TABLE IF EXISTS Test");
execSQL(@"CREATE TABLE Test(id int, t time)");
Modified: branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySql.Data/Tests/Source/TimeoutAndCancel.cs 2008-11-11 21:58:18 UTC (rev 1449)
@@ -23,6 +23,7 @@
using System.IO;
using System.Threading;
using NUnit.Framework;
+using System.Globalization;
namespace MySql.Data.MySqlClient.Tests
{
@@ -239,6 +240,8 @@
[Test]
public void ConnectionStringModifiedAfterCancel()
{
+ if (version < new Version(5, 0)) return;
+
bool isPooling = pooling;
pooling = true;
string connStr = GetConnectionString(true);
@@ -255,7 +258,7 @@
using (MySqlDataReader reader = cmd.ExecuteReader())
{
- string connStr2 = c.ConnectionString.ToLowerInvariant();
+ string connStr2 = c.ConnectionString.ToLower(CultureInfo.InvariantCulture);
Assert.AreEqual(-1, connStr2.IndexOf("pooling=true"));
Assert.AreEqual(-1, connStr2.IndexOf("pooling=false"));
reader.Read();
Modified: branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs 2008-11-11 21:58:18 UTC (rev 1449)
@@ -567,19 +567,16 @@
@failedPasswordAttemptWindowStart, @failedPasswordAnswerAttemptCount,
@failedPasswordAnswerAttemptWindowStart)",
connection);
- Console.WriteLine("point 1");
cmd.Parameters.AddWithValue("@userId", userId);
cmd.Parameters.AddWithValue("@email", email);
cmd.Parameters.AddWithValue("@comment", "");
cmd.Parameters.AddWithValue("@password",
EncodePassword(password, passwordKey, PasswordFormat));
- Console.WriteLine("point 2");
cmd.Parameters.AddWithValue("@passwordKey", passwordKey);
cmd.Parameters.AddWithValue("@passwordFormat", PasswordFormat);
cmd.Parameters.AddWithValue("@passwordQuestion", passwordQuestion);
cmd.Parameters.AddWithValue("@passwordAnswer",
EncodePassword(passwordAnswer, passwordKey, PasswordFormat));
- Console.WriteLine("point 3");
cmd.Parameters.AddWithValue("@isApproved", isApproved);
cmd.Parameters.AddWithValue("@lastActivityDate", createDate);
cmd.Parameters.AddWithValue("@lastLoginDate", createDate);
Modified: branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs 2008-11-11 21:58:18 UTC (rev 1449)
@@ -367,7 +367,6 @@
WriteToEventLog(ex, "GetUsersInRole");
throw;
}
- return new string[0];
}
/// <summary>
Modified: branches/5.2/Package.build
===================================================================
--- branches/5.2/Package.build 2008-11-11 17:24:53 UTC (rev 1448)
+++ branches/5.2/Package.build 2008-11-11 21:58:18 UTC (rev 1449)
@@ -2,7 +2,7 @@
<project name="MySqlPackage" default="all" xmlns="http://nant.sf.net/schemas/nant-0.85.win32.net-1.0.xsd">
<description>Package script for MySQLClient Managed Provider for MySQL</description>
- <include buildfile="Client.build"/>
+<!-- <include buildfile="Client.build"/>-->
<!-- first remove all previous packages -->
<delete dir="packages" failonerror="false"/>
@@ -24,14 +24,7 @@
<!-- packaging targets -->
- <target name="all" depends="GPL, Commercial">
- <checksum algorithm="MD5" fileext="MD5">
- <fileset>
- <include name="packages/**/*.exe"/>
- <include name="packages/**/*.zip"/>
- </fileset>
- </checksum>
- </target>
+ <target name="all" depends="GPL, Commercial"/>
<!-- Commercial package target -->
<target name="Commercial">
@@ -80,7 +73,7 @@
<exec workingdir="Installer" program="light"
commandline="-sval -ext WixNetFxExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us main.wixobj samples.wixobj visualstudio.wixobj webproviders.wixobj ui.wixobj cf.wixobj core.wixobj -out MySql.Data.msi"/>
- <zip zipfile="packages/mysql-connector-net-${version}${postfix}.zip">
+ <zip zipfile="packages/mysql-connector-net-${version}${postfix}.zip">
<fileset basedir="Installer">
<include name="mysql.data.msi"/>
</fileset>
| Thread |
|---|
| • Connector/NET commit: r1449 - in branches/5.2: . Installer MySql.Data/Provider/Source MySql.Data/Tests/Source MySql.Web/Providers/Source | rburnett | 11 Nov |
