aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-08-30 22:40:43 +0000
committerrowanbeentje <rowan@beent.je>2010-08-30 22:40:43 +0000
commitd1d0967f7e534bc36533470f2a0a93c69213db61 (patch)
treeb5440270b8321c7c67b1548d7774d4d01d40407e
parent4c5b8f2d34e9f15e65bf9bff03b5505240ee461e (diff)
downloadsequelpro-d1d0967f7e534bc36533470f2a0a93c69213db61.tar.gz
sequelpro-d1d0967f7e534bc36533470f2a0a93c69213db61.tar.bz2
sequelpro-d1d0967f7e534bc36533470f2a0a93c69213db61.zip
- Attempt more status checking before closing the MySQL connection, in an attempt to further address http://spbug.com/l/13
- Update localisable strings
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m6
-rw-r--r--Resources/English.lproj/ExportDialog.stringsbin23334 -> 23706 bytes
-rw-r--r--Resources/English.lproj/Localizable.stringsbin167192 -> 168700 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index d7cd1fba..65545f77 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -456,7 +456,7 @@ static BOOL sTruncateLongFieldInLogs = YES;
// Small pause for cleanup.
usleep(100000);
- mysql_close(mConnection);
+ if (mConnection->net.vio && mConnection->net.buff) mysql_close(mConnection);
mConnection = NULL;
}
@@ -495,7 +495,7 @@ static BOOL sTruncateLongFieldInLogs = YES;
// Close the connection if it exists.
if (mConnected) {
- mysql_close(mConnection);
+ if (mConnection->net.vio && mConnection->net.buff) mysql_close(mConnection);
mConnection = NULL;
}
@@ -1220,7 +1220,7 @@ void performThreadedKeepAlive(void *ptr)
if (mConnected) {
// Disconnect if it was already connected
- mysql_close(mConnection);
+ if (mConnection->net.vio && mConnection->net.buff) mysql_close(mConnection);
mConnection = NULL;
mConnected = NO;
[self init];
diff --git a/Resources/English.lproj/ExportDialog.strings b/Resources/English.lproj/ExportDialog.strings
index 9dbf666e..f8212658 100644
--- a/Resources/English.lproj/ExportDialog.strings
+++ b/Resources/English.lproj/ExportDialog.strings
Binary files differ
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 62fc3d58..e39c1a96 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ