bzr push into connector-net-trunk branch (vvaintroub:795 to 796) Bug#47219

[Vladislav Vaintroub]

  796 Vladislav Vaintroub	2009-11-04
      - fixed SessionProvider to be compatible with 4.x MySQL, replaced TIMESTAMPDIFF with
TIME_TO_SEC
       (bug#47219)

    modified:
      CHANGES
      MySql.Web/Providers/Source/SessionProvider.cs
  795 Reggie Burnett	2009-11-03 [merge]
      core projects now compatible with VS2010 beta 2

    modified:
      MySql.Data/Provider/MySql.Data.csproj
      MySql.Data/Tests/MySql.Data.Tests.csproj
      MySql.Web/Providers/MySql.Web.csproj
      MySql.Web/Tests/MySql.Web.Tests.csproj
=== modified file 'CHANGES'
--- a/CHANGES	2009-11-03 18:00:36 +0000
+++ b/CHANGES	2009-11-04 18:06:47 +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 18:06: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]