From 761ee77727eb18e0ed6980ea98ea723cb8b3e817 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 9 Apr 2012 16:37:31 +0000 Subject: - Upgrade to the MySQL 5.5.22 client libraries, updating to a much more up-to-date codebase. - Update the build-mysql-client.sh MySQL build script within SPMySQL.framework to allow it to easily build 5.5 client libraries - Fix reconnection within SPMySQL.framework after a connection is lost for MySQL servers < 5 when a query is cancelled by killing the connection --- Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m') diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m b/Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m index 8ba55134..1fa4b829 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m @@ -398,6 +398,11 @@ typedef struct st_spmysqlstreamingrowdata { [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]; + } + dataDownloaded = YES; [downloadPool drain]; } -- cgit v1.2.3