List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:June 10 2010 4:51pm
Subject:bzr commit into connector-net-6.0 branch (vvaintroub:813) Bug#53357
View as plain text  
#At file:///H:/connector_net/6.0/ based on revid:vvaintroub@stripped

  813 Vladislav Vaintroub	2010-06-10
      - When command is killed, e.g as result of timeout, error code returned from server 
      is not necessarily 1317 (QueryInterrupted). It might as well be 1028 (FileSortAborted).
      Fix timeout handling to handle both error codes in the same fashion (bug #53357)

    modified:
      CHANGES
      MySql.Data/Provider/Source/command.cs
=== modified file 'CHANGES'
--- a/CHANGES	2010-04-27 16:41:57 +0000
+++ b/CHANGES	2010-06-10 16:51:31 +0000
@@ -1,3 +1,7 @@
+- When command is killed, e.g as result of timeout, error code returned from server 
+is not necessarily 1317 (QueryInterrupted). It might as well be 1028 (FileSortAborted).
+Fix timeout handling to handle both error codes in the same fashion (bug #53357)
+
 Version 6.0.6
 - When sending file to server (LOAD DATA INFILE) open the file for read only, not for read/write
  (bug #48944)

=== modified file 'MySql.Data/Provider/Source/command.cs'
--- a/MySql.Data/Provider/Source/command.cs	2010-02-19 15:43:40 +0000
+++ b/MySql.Data/Provider/Source/command.cs	2010-06-10 16:51:31 +0000
@@ -447,7 +447,7 @@ namespace MySql.Data.MySqlClient
                 catch (Exception) { }
 
                 // if we caught an exception because of a cancel, then just return null
-                if (ex.Number == 1317)
+                if (ex.IsQueryAborted)
                 {
                     if (TimedOut)
                         throw new MySqlException(Resources.Timeout);


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20100610165131-r30vm4uelbtbvrzk.bundle
Thread
bzr commit into connector-net-6.0 branch (vvaintroub:813) Bug#53357Vladislav Vaintroub10 Jun