Permalink
Browse files

Merge pull request #2557 from sebcode/master

Add possible socket locations for MariaDB via MacPorts.
  • Loading branch information...
abhibeckert committed Aug 31, 2016
2 parents 25e19bf + 9239b2e commit 4154cbaf36253825674c02b0391b78938200b359
Showing with 5 additions and 3 deletions.
  1. +5 −3 Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m
@@ -409,9 +409,11 @@ + (NSString *)findSocketPath
@"/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

0 comments on commit 4154cba

Please sign in to comment.