Skip to content

Commit 4154cba

Browse files
authored
Merge pull request #2557 from sebcode/master
Add possible socket locations for MariaDB via MacPorts.
2 parents 25e19bf + 9239b2e commit 4154cba

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m

+5-3
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,11 @@ + (NSString *)findSocketPath
409409
@"/Applications/MAMP/tmp/mysql/mysql.sock", // MAMP default location
410410
@"/Applications/xampp/xamppfiles/var/mysql/mysql.sock", // XAMPP default location
411411
@"/var/mysql/mysql.sock", // Mac OS X Server default
412-
@"/opt/local/var/run/mysqld/mysqld.sock", // Darwinports MySQL
413-
@"/opt/local/var/run/mysql4/mysqld.sock", // Darwinports MySQL 4
414-
@"/opt/local/var/run/mysql5/mysqld.sock", // Darwinports MySQL 5
412+
@"/opt/local/var/run/mysqld/mysqld.sock", // MacPorts MySQL
413+
@"/opt/local/var/run/mysql4/mysqld.sock", // MacPorts MySQL 4
414+
@"/opt/local/var/run/mysql5/mysqld.sock", // MacPorts MySQL 5
415+
@"/opt/local/var/run/mariadb-10.0/mysqld.sock", // MacPorts MariaDB 10.0
416+
@"/opt/local/var/run/mariadb-10.1/mysqld.sock", // MacPorts MariaDB 11.0
415417
@"/usr/local/zend/mysql/tmp/mysql.sock", // Zend Server CE (see Issue #1251)
416418
@"/var/run/mysqld/mysqld.sock", // As used on Debian/Gentoo
417419
@"/var/tmp/mysql.sock", // As used on FreeBSD

0 commit comments

Comments
 (0)