- 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, 2 insertions, 2 deletions

diff --git a/Source/TableSource.m b/Source/TableSource.m
index c5e2a4b8..da5577de 100644
--- a/Source/TableSource.m
+++ b/Source/TableSource.m
@@ -635,8 +635,8 @@ fetches the result as an array with a dictionary for each row in it
 
 		//use NULL string from preferences instead of the NSNull oject returned by the framework
 		keys = [tempRow allKeys];
-		for (NSInteger i = 0; i < [keys count] ; i++) {
-			key = NSArrayObjectAtIndex(keys, i);
+		for (NSInteger j = 0; j < [keys count] ; j++) {
+			key = NSArrayObjectAtIndex(keys, j);
 			if ( [[tempRow objectForKey:key] isMemberOfClass:nullClass] )
 				[tempRow setObject:prefsNullValue forKey:key];
 		}