aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2012-04-18 23:59:05 +0000
committerrowanbeentje <rowan@beent.je>2012-04-18 23:59:05 +0000
commit497ab60346e74927fb7980734799d1e57af541d5 (patch)
treee215d8c61002e1869759a47c6f344f5e9a729221 /Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
parentec277286b0200cf5c36c4bb2ef11cb5fd9b31a67 (diff)
downloadsequelpro-497ab60346e74927fb7980734799d1e57af541d5.tar.gz
sequelpro-497ab60346e74927fb7980734799d1e57af541d5.tar.bz2
sequelpro-497ab60346e74927fb7980734799d1e57af541d5.zip
- Correctly call mysql_library_init() on application start, and mysql_thread_init() and mysql_thread_end() on each thread as appropriate. This will improve observed MySQL stability, especially in certain circumstances such as LOAD DATA INFILE.
Diffstat (limited to 'Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m')
-rw-r--r--Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m6
1 files changed, 6 insertions, 0 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
index 5df71e96..46615cae 100644
--- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
+++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
@@ -76,6 +76,9 @@
}
if (![self _checkConnectionIfNecessary]) return nil;
+ // Ensure per-thread variables are set up
+ [self _validateThreadSetup];
+
// Perform a lossy conversion to bytes, using NSData to do the hard work. Preserves
// nul characters correctly.
NSData *cData = [theString dataUsingEncoding:stringEncoding allowLossyConversion:YES];
@@ -229,6 +232,9 @@
return nil;
}
+ // Ensure per-thread variables are set up
+ [self _validateThreadSetup];
+
// Check the connection if necessary, returning nil if the query couldn't be validated
if (![self _checkConnectionIfNecessary]) return nil;