- changed the query locking mechanism for MCPConnection to be more thread safe. From now on, always use [self lockConnection] rather than [queryLock lock], independent of what thread you are running on

- A warning is written to the console when the connection is unlocked multiple times (to identify potential race conditions) 
- modified MCPStreamingResult to ensure it only closes the connection once
- added a check to prevent arrow key navigation past the last row

1 files changed, 5 insertions, 2 deletions

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
index dd8a172e..10d46df2 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
@@ -134,8 +134,10 @@
 	NSUInteger       mConnectionFlags; /* The flags to be used for the connection to the database. */
 	
 	id delegate; /* Connection delegate */
-	
-	NSLock *queryLock; /* Anything that performs a mysql_net_read is not thread-safe: mysql queries, pings */
+    
+	/* Anything that performs a mysql_net_read is not thread-safe: mysql queries, pings */
+    /* Always lock the connection first. Don't use this lock directly, use the lockConnection method! */
+	NSConditionLock *connectionLock; 
 
 	BOOL useKeepAlive;
 	BOOL isDisconnecting;
@@ -278,6 +280,7 @@ void performThreadedKeepAlive(void *ptr);
 
 // Locking
 - (void)lockConnection;
+- (BOOL)tryLockConnection;
 - (void)unlockConnection;
 
 // Database structure