From 9239b2e6f1a9829b7b4386738133f81b3e7f31da Mon Sep 17 00:00:00 2001 From: Sebastian Volland Date: Tue, 30 Aug 2016 19:23:03 +0300 Subject: Add possible socket locations for MariaDB via MacPorts. Also rename Darwinports to MacPorts in comments. --- Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Frameworks') 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 -- cgit v1.2.3