- Correctly report errors triggered *during* result download for streaming results. This improves partial content displays (using the new code as of r1530) and also improves custom query error reporting.

1 files changed, 10 insertions, 1 deletions

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index 7db3ec2d..07ea4c39 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -1126,6 +1126,15 @@ void performThreadedKeepAlive(void *ptr)
 	return NO;
 }
 
+/**
+ * Update error messages - for example after a streaming result has finished processing.
+ */
+- (void)updateErrorStatuses
+{
+	[self setLastErrorMessage:nil];
+	lastQueryErrorId = mysql_errno(mConnection);
+}
+
 #pragma mark -
 #pragma mark Queries
 
@@ -1405,7 +1414,7 @@ void performThreadedKeepAlive(void *ptr)
 			
 			if (queryCancelled) {
 				queryErrorMessage = [[NSString alloc] initWithString:NSLocalizedString(@"Query cancelled.", @"Query cancelled error")];
-				queryErrorId = 1152;
+				queryErrorId = 1317;
 			} else {			
 				queryErrorMessage = [[NSString alloc] initWithString:[self stringWithCString:mysql_error(mConnection)]];
 				queryErrorId = mysql_errno(mConnection);