diff options
author | stuconnolly <stuart02@gmail.com> | 2011-03-08 20:41:11 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2011-03-08 20:41:11 +0000 |
commit | 4a950f357fb29640b2732ca34c80f81c0b23fbe6 (patch) | |
tree | 8dab179aa98c223a9791889846032c0e960636b4 /Frameworks | |
parent | 2baa01621f83df3c81e6b6ed2310d483962dcf48 (diff) | |
download | sequelpro-4a950f357fb29640b2732ca34c80f81c0b23fbe6.tar.gz sequelpro-4a950f357fb29640b2732ca34c80f81c0b23fbe6.tar.bz2 sequelpro-4a950f357fb29640b2732ca34c80f81c0b23fbe6.zip |
Bring outline view branch up to date with trunk (r3227:r3233).
Diffstat (limited to 'Frameworks')
-rw-r--r-- | Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h index 6364add8..0b3f932b 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h @@ -182,6 +182,7 @@ void pingThreadCleanup(void *pingDetails); // MySQL defaults + (NSDictionary *)getMySQLLocales; + (NSStringEncoding)encodingForMySQLEncoding:(const char *)mysqlEncoding; ++ (NSString *) mySQLEncodingForStringEncoding:(NSStringEncoding)stringEncoding; + (NSStringEncoding)defaultMySQLEncoding; + (BOOL)isErrorNumberConnectionError:(NSInteger)theErrorNumber; |