diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-04-16 20:16:52 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-04-16 20:16:52 +0000 |
| commit | 4cad6f0e6e4fb497b480256c2abe3de34ebf225c (patch) | |
| tree | b66d6a72a1537cf98624acf3c685f1a4d916fd86 /Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m | |
| parent | 0d3b69f964a8d9d93ca794d457b461463f1ec95d (diff) | |
| download | sequelpro-4cad6f0e6e4fb497b480256c2abe3de34ebf225c.tar.gz sequelpro-4cad6f0e6e4fb497b480256c2abe3de34ebf225c.tar.bz2 sequelpro-4cad6f0e6e4fb497b480256c2abe3de34ebf225c.zip | |
Bring outline view branch up to date with trunk.
Diffstat (limited to 'Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m')
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m b/Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m index b19e5356..51a17611 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m @@ -170,6 +170,12 @@ dataDownloaded = YES; [parentConnection _unlockConnection]; connectionUnlocked = YES; + + // If the connection query may have been cancelled with a query kill, double-check connection + if ([parentConnection lastQueryWasCancelled] && [parentConnection serverMajorVersion] < 5) { + [parentConnection checkConnection]; + } + return nil; } |