bzr push into connector-net-trunk branch (vvaintroub:793)

[Vladislav Vaintroub]

  793 Vladislav Vaintroub	2009-11-04 [merge]
      merge

    modified:
      CHANGES
      MySql.Data.Entity/Tests/DataTypeTests.cs
      MySql.Data.Entity/Tests/Properties/schema.sql
      MySql.Data.Entity/Tests/TestModel.Designer.cs
      MySql.Data.Entity/Tests/TestModel.csdl
      MySql.Data.Entity/Tests/TestModel.msl
      MySql.Data.Entity/Tests/TestModel.ssdl
      MySql.Data/Provider/MySql.Data.csproj
      MySql.Data/Provider/Source/Connection.cs
      MySql.Data/Provider/Source/command.cs
      MySql.Data/Provider/Source/parameter.cs
      MySql.Data/Tests/MySql.Data.Tests.csproj
      MySql.Data/Tests/Source/CommandTests.cs
      MySql.Web/Providers/MySql.Web.csproj
      MySql.Web/Tests/MySql.Web.Tests.csproj
=== modified file 'CHANGES'
--- a/CHANGES	2009-11-03 18:01:44 +0000
+++ b/CHANGES	2009-11-04 15:47:24 +0000
@@ -1,4 +1,6 @@
 Version 6.2.1
+- fixed SessionProvider to be compatible with 4.x MySQL, replaced TIMESTAMPDIFF with
TIME_TO_SEC
+  (bug#47219)
 - implemented support for client SSL certificates
 - fixed indexes schema collection so that it still works with bad table names such as
b``a`d (bug #48101)
 - fixed guid type so that multi-byte character sets will not effect how it works.  A
column would be

=== modified file 'MySql.Web/Providers/Source/SessionProvider.cs'
--- a/MySql.Web/Providers/Source/SessionProvider.cs	2009-10-14 23:15:49 +0000
+++ b/MySql.Web/Providers/Source/SessionProvider.cs	2009-11-04 15:45:47 +0000
@@ -521,7 +521,7 @@ namespace MySql.Web.SessionState
                     // Retrieve the current session item information.
                     cmd = new MySqlCommand(
                       "SELECT (NOW() > Expires) as Expired, SessionItems, LockId, 
Flags, Timeout, " +
-                      "  TIMESTAMPDIFF(SECOND, LockDate, NOW()) as lockAge " +
+                      "  TIME_TO_SEC(NOW() - LockDate) as lockAge " +
                       "  FROM my_aspnet_Sessions" +
                       "  WHERE SessionId = @SessionId AND ApplicationId =
@ApplicationId", conn);
 


Attachment: [text/bzr-bundle] bzr/[e-mail]