diff options
| author | Abhi Beckert <abhi@abhibeckert.com> | 2016-09-01 07:20:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 07:20:39 +1000 |
| commit | 4154cbaf36253825674c02b0391b78938200b359 (patch) | |
| tree | 4fd866cd2c5add0a0bf44854af6be61fda0df945 | |
| parent | 25e19bf6eb4a33213de7b4fdfbcae382dd359913 (diff) | |
| parent | 9239b2e6f1a9829b7b4386738133f81b3e7f31da (diff) | |
| download | sequelpro-4154cbaf36253825674c02b0391b78938200b359.tar.gz sequelpro-4154cbaf36253825674c02b0391b78938200b359.tar.bz2 sequelpro-4154cbaf36253825674c02b0391b78938200b359.zip | |
Merge pull request #2557 from sebcode/master
Add possible socket locations for MariaDB via MacPorts.
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m index 399fc8bb..ce980af8 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m @@ -409,9 +409,11 @@ const char *SPMySQLSSLPermissibleCiphers = "DHE-RSA-AES256-SHA:AES256-SHA:DHE-RS @"/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 + @"/opt/local/var/run/mysqld/mysqld.sock", // MacPorts MySQL + @"/opt/local/var/run/mysql4/mysqld.sock", // MacPorts MySQL 4 + @"/opt/local/var/run/mysql5/mysqld.sock", // MacPorts MySQL 5 + @"/opt/local/var/run/mariadb-10.0/mysqld.sock", // MacPorts MariaDB 10.0 + @"/opt/local/var/run/mariadb-10.1/mysqld.sock", // MacPorts MariaDB 11.0 @"/usr/local/zend/mysql/tmp/mysql.sock", // Zend Server CE (see Issue #1251) @"/var/run/mysqld/mysqld.sock", // As used on Debian/Gentoo @"/var/tmp/mysql.sock", // As used on FreeBSD |