diff options
| author | rowanbeentje <rowan@beent.je> | 2010-07-08 21:59:17 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-07-08 21:59:17 +0000 |
| commit | 9927b24c952fc7dcff61876a67a0b670d65ee1f3 (patch) | |
| tree | 79afeb6cd9588479af2768461e2cf62755931f84 /Frameworks/MCPKit | |
| parent | c90e9a3d318488d15997d7edc2941ede6fc89a68 (diff) | |
| download | sequelpro-9927b24c952fc7dcff61876a67a0b670d65ee1f3.tar.gz sequelpro-9927b24c952fc7dcff61876a67a0b670d65ee1f3.tar.bz2 sequelpro-9927b24c952fc7dcff61876a67a0b670d65ee1f3.zip | |
- Add default socket locations for Mac OS X Server and XAMPP to default socket search paths
- Reorder socket search paths to favour OS X locations
Diffstat (limited to 'Frameworks/MCPKit')
| -rw-r--r-- | Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m index 9ca945a7..e6db24fc 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m @@ -2471,14 +2471,16 @@ void performThreadedKeepAlive(void *ptr) NSArray *possibleSocketLocations = [NSArray arrayWithObjects: @"/tmp/mysql.sock", // Default + @"/Applications/MAMP/tmp/mysql/mysql.sock", // MAMP default location + @"/Applications/xampp/xamppfiles/var/mysql/mysql.sock", // XAMPP default location + @"/var/mysql/mysql.sock", // Mac OS X Server default + @"/opt/local/var/run/mysqld/mysqld.sock", // Darwinports MySQL + @"/opt/local/var/run/mysql4/mysqld.sock", // Darwinports MySQL 4 + @"/opt/local/var/run/mysql5/mysqld.sock", // Darwinports MySQL 5 @"/var/run/mysqld/mysqld.sock", // As used on Debian/Gentoo @"/var/tmp/mysql.sock", // As used on FreeBSD @"/var/lib/mysql/mysql.sock", // As used by Fedora @"/opt/local/lib/mysql/mysql.sock", // Alternate fedora - @"/opt/local/var/run/mysqld/mysqld.sock", // Darwinports MySQL - @"/opt/local/var/run/mysql4/mysqld.sock", // Darwinports MySQL 4 - @"/opt/local/var/run/mysql5/mysqld.sock", // Darwinports MySQL 5 - @"/Applications/MAMP/tmp/mysql/mysql.sock", // MAMP default location nil]; for (NSInteger i = 0; i < [possibleSocketLocations count]; i++) |