- Make a number of changes to attempt to improve disconnection/quit crashes: prevent multiple disconnects, add more checks, cancel current queries, and add a tiny delay to allow mysql cleanup.

 - Alter MCPStreamingResult to no longer return a retained instance, setting up correct result disposal on autorelease but changing callers to retain as soon as they receive.
 - Review and change a number of local variables shadowing/shielding other local or global variables.

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/TableContent.m b/Source/TableContent.m
index 4c9336d8..b0e5e8fe 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -609,7 +609,7 @@
 	// Perform and process the query
 	[tableContentView performSelectorOnMainThread:@selector(noteNumberOfRowsChanged) withObject:nil waitUntilDone:YES]; 
 	[self setUsedQuery:queryString];
-	streamingResult = [mySQLConnection streamingQueryString:queryString];
+	streamingResult = [[mySQLConnection streamingQueryString:queryString] retain];
 
 	// Ensure the number of columns are unchanged; if the column count has changed, abort the load
 	// and queue a full table reload.
@@ -624,15 +624,15 @@
 	// Process the result into the data store
 	if (!fullTableReloadRequired && streamingResult) {
 		[self processResultIntoDataStorage:streamingResult approximateRowCount:rowsToLoad];
-		[streamingResult release];
 	}
+	if (streamingResult) [streamingResult release];
 
 	// If the result is empty, and a late page is selected, reset the page
 	if (!fullTableReloadRequired && [prefs boolForKey:SPLimitResults] && queryStringBeforeLimit && !tableRowsCount && ![mySQLConnection queryCancelled]) {
 		contentPage = 1;
 		queryString = [NSMutableString stringWithFormat:@"%@ LIMIT 0,%ld", queryStringBeforeLimit, (long)[prefs integerForKey:SPLimitResultsValue]];
 		[self setUsedQuery:queryString];
-		streamingResult = [mySQLConnection streamingQueryString:queryString];
+		streamingResult = [[mySQLConnection streamingQueryString:queryString] retain];
 		if (streamingResult) {
 			[self processResultIntoDataStorage:streamingResult approximateRowCount:[prefs integerForKey:SPLimitResultsValue]];
 			[streamingResult release];