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

 1015 Reggie Burnett	2011-06-29
      fixed a couple of test case failures

    modified:
      Tests/MySql.Data.Tests/BlobTests.cs
      Tests/MySql.Data.Tests/Logging.cs
      VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx
=== modified file 'Tests/MySql.Data.Tests/BlobTests.cs'
=== 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 '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


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110629153124-jqrj8obwrsqqew0w.bundle
Thread
bzr commit into connector-net-6.4 branch (reggie.burnett:1015) Reggie Burnett29 Jun