List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:June 29 2011 3:39pm
Subject:bzr commit into connector-net-trunk branch (reggie.burnett:1003)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/trunk/ based on revid:julio.casal@strippedrf0wspx9o

 1003 Reggie Burnett	2011-06-29 [merge]
      merged

    modified:
      Source/MySql.Data.Entity/Properties/Resources.Designer.cs
      Source/MySql.Data/Properties/VersionInfo.cs
      Source/MySql.VisualStudio/Properties/Resources.resx
      Tests/MySql.Data.Tests/BlobTests.cs
      Tests/MySql.Data.Tests/Logging.cs
      Tests/MySql.Data.Tests/MySql.Data.Tests.csproj
      VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx
=== modified file 'Source/MySql.Data.Entity/Properties/Resources.Designer.cs'
=== modified file 'Source/MySql.Data.Entity/Properties/Resources.Designer.cs'
--- a/Source/MySql.Data.Entity/Properties/Resources.Designer.cs	2011-06-21 18:51:27 +0000
+++ b/Source/MySql.Data.Entity/Properties/Resources.Designer.cs	2011-06-29 15:37:21 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5444
+//     Runtime Version:4.0.30319.235
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@
     // 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

=== modified file 'Source/MySql.Data/Properties/VersionInfo.cs'
--- a/Source/MySql.Data/Properties/VersionInfo.cs	2011-06-06 17:57:52 +0000
+++ b/Source/MySql.Data/Properties/VersionInfo.cs	2011-06-28 16:08:55 +0000
@@ -37,5 +37,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.4.1")]
+[assembly: AssemblyVersion("6.4.2")]
 

=== modified file 'Source/MySql.VisualStudio/Properties/Resources.resx'
--- a/Source/MySql.VisualStudio/Properties/Resources.resx	2010-05-19 17:41:25 +0000
+++ b/Source/MySql.VisualStudio/Properties/Resources.resx	2011-06-29 15:37:21 +0000
@@ -511,7 +511,7 @@
     <value>The data length for the table.</value>
   </data>
   <data name="ProductDetails" xml:space="preserve">
-    <value>Data design and management tools for MySQL.  Copyright © 2007-2009 MySQL AB</value>
+    <value>Data design and management tools for MySQL.  Copyright © 2007-2011 Oracle, Inc.</value>
   </data>
   <data name="DisplayName_View_IsUpdatable" xml:space="preserve">
     <value>Is Updatable</value>

=== modified file 'Tests/MySql.Data.Tests/BlobTests.cs'
--- a/Tests/MySql.Data.Tests/BlobTests.cs	2011-06-23 20:52:58 +0000
+++ b/Tests/MySql.Data.Tests/BlobTests.cs	2011-06-29 15:31:24 +0000
@@ -292,7 +292,7 @@
 		[Test]
 		public void BlobBiggerThanMaxPacket()
 		{
-			suExecSQL("SET GLOBAL max_allowed_packet=500000");
+			suExecSQL("SET GLOBAL max_allowed_packet=" + 500*1024);
 			execSQL("CREATE TABLE test (id INT(10), image BLOB)");
 
 			using (MySqlConnection c = new MySqlConnection(GetConnectionString(true)))

=== modified file 'Tests/MySql.Data.Tests/Logging.cs'
--- a/Tests/MySql.Data.Tests/Logging.cs	2011-06-21 18:51:27 +0000
+++ b/Tests/MySql.Data.Tests/Logging.cs	2011-06-29 15:31:24 +0000
@@ -121,8 +121,8 @@
             GenericListener listener = new GenericListener();
             MySqlTrace.Listeners.Add(listener);
 
-            string sql = @"SELECT 1 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1`,  2 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2`,
-                3 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3`,  4 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4`,
+            string sql = @"SELECT 1 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1`,  2 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2`,
+                3 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3`,  4 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4`,
                 5 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5`,  6 AS `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6`;";
             MySqlCommand cmd = new MySqlCommand(sql, conn);
             using (MySqlDataReader reader = cmd.ExecuteReader())

=== modified file 'Tests/MySql.Data.Tests/MySql.Data.Tests.csproj'
--- a/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj	2011-06-21 19:16:59 +0000
+++ b/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj	2011-06-28 16:08:55 +0000
@@ -95,6 +95,7 @@
     <Compile Include="PreparedStatements.cs" />
     <Compile Include="ProcedureParameters.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReplicationTests.cs" />
     <Compile Include="ScriptExecution.cs" />
     <Compile Include="SimpleTransactions.cs" />
     <Compile Include="SqlServerMode.cs" />
@@ -104,6 +105,7 @@
     <Compile Include="StressTests.cs" />
     <Compile Include="Syntax.cs" />
     <Compile Include="Syntax2.cs" />
+    <Compile Include="TableCaching.cs" />
     <Compile Include="Threading.cs" />
     <Compile Include="TimeoutAndCancel.cs" />
     <Compile Include="Tokenizer.cs" />

=== modified file 'VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx'
--- a/VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx	2011-06-21 18:51:27 +0000
+++ b/VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx	2011-06-29 15:31:24 +0000
@@ -137,7 +137,8 @@
   </data>
   <data name="AverageWithGrouping" xml:space="preserve">
     <value>SELECT
-GroupBy1.A1 AS C1
+1 AS C1, 
+GroupBy1.A1 AS C2
 FROM (SELECT
 Extent2.Id AS K1, 
 AVG(Extent1.Freight) AS A1

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into connector-net-trunk branch (reggie.burnett:1003) Reggie Burnett29 Jun