From: Vladislav Vaintroub Date: September 26 2009 7:11pm Subject: bzr commit into connector-net-trunk branch (vvaintroub:738) List-Archive: http://lists.mysql.com/commits/84725 Message-Id: <0KQL000RYENJA300@fe-emea-09.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_LdGG4XdPE1NCPj9nDx/UsA)" --Boundary_(ID_LdGG4XdPE1NCPj9nDx/UsA) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///H:/connector_net/timeouts/ based on revid:vvaintroub@stripped 738 Vladislav Vaintroub 2009-09-26 Fix wrong comment modified: MySql.Data/Provider/Source/datareader.cs === modified file 'MySql.Data/Provider/Source/datareader.cs' --- a/MySql.Data/Provider/Source/datareader.cs 2009-09-26 12:32:55 +0000 +++ b/MySql.Data/Provider/Source/datareader.cs 2009-09-26 19:11:36 +0000 @@ -838,10 +838,7 @@ namespace MySql.Data.MySqlClient // single result means we only return a single resultset. If we have already // returned one, then we return false; if (resultSet != null && (commandBehavior & CommandBehavior.SingleResult) != 0) - { - // Command is completed, clear the IO timeouts for the stream return false; - } // next load up the next resultset if any --Boundary_(ID_LdGG4XdPE1NCPj9nDx/UsA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/vvaintroub@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/vvaintroub@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vvaintroub@stripped # target_branch: file:///H:/connector_net/timeouts/ # testament_sha1: fa3d3a6aeadd075a997514b5e9bc7fba41cde982 # timestamp: 2009-09-26 21:11:37 +0200 # source_branch: file:///H:/connector_net/trunk/ # base_revision_id: vvaintroub@stripped\ # hb4l0r12px1nhaho # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXeuQZgAAYZfgAAQU2P//1cC SQC////wUANa7wDriBphJJKPRp6KbU8U2k9Amaeqep6gGmgabUMAAAABoAAAAAGQplAyMgANAAAG gDQZUajTZRiGQaaA0GAmJoZGgSSAQATQammmjSnoYKek9TJ6aQpw3R1n8pJAZAhopRquaAwOUBYF sM2t0Q2OQIgm5hvTRppBp87jl7ye3GbDg5zcmOLCwfZdPoJX26a2hegc/rQSsfJzFQu5BK4I1nAU FJyAuAe0IuBKi3jFBD79ttdymMyPN/on8+czvcImcCiFQRUUyIFCSyCxE2H0FMOXow7qjhoFwvY1 O0uPWWJYJ0iJoTPDFdAibfURoo5G/JJhsAgIkoQDkvNIeey5iiE7Iu4cTMgDiQr9hMtY8TLVV0GY aZE1eZma4YqNBxgn1kCwcWlgOFSZjeHWno4G4uKFQqYCskUD2YXHHrIq1bFcQMDcxddYqhw+3NQW 0dowWjDG5FqeVE5PVycPVwhwqlk8RLHabDDDG7IuMFfaZWLFPvKwjFOXkvM+rC9GLT51kNEMqh2h BZzjRCz1D0VqxuEhokKDtKVkJEkxAhMtmdd6YGv6QmwODcaHYdS+3CwOlhqFYfH3SPHEwj3uTxeS +VsU3fztDKI0kSRetqxjLRsRcXlxBZFcuxSvFmrraCRaMtW3wKlREqicetx0p0yqJkQM2c1ijUij VAaxuGrep06LImIFIrCFG4+Dt7qWl6A7F3Y8X/QVbvBMh3BK+2W4N5JTAinYbDMYtTjIoXi9uXdt ZejuIvxO4TZhENQtFSgVmWZP5RvUDeVJyw9wq/ywFm+OAFYFe/pDl9haGSyD/RLiE16t1LLy4yFb 0SNVIxp/W5w+RHie6RGAG8i8Hs3aHZguaIoTIZc+/BlwQoAd8BdwSXe5WwBftVuWeJppooFArxlI bkFi1SNtwvoDKsPrWorsQGpnjiQtSfSNedowGAP4vD0DFTdKsgRIxyBtGo1AaKd/aRNRRl59vg8b 4HK1lAT69g/DrPzAoFQBYuDiTLBxQF483qkAv8kiiesgPn73LrHJsvVYGJTUs3NOtSMBT4zF/i7k inChIO9cgzA= --Boundary_(ID_LdGG4XdPE1NCPj9nDx/UsA)--