From f632b6627472871cbd7fd308b199bd761d1aed5c Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 3 Jan 2016 19:18:32 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/FindMySQL.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index 0e0ebfd48..5f1f288cd 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -20,6 +20,8 @@ ELSE()
       /usr/include/mysql
       /usr/local/include/mysql
       /opt/local/include/mysql5/mysql
+      /opt/local/include/mysql55/mysql
+      /opt/local/include/mysql51/mysql
       $ENV{ProgramFiles}/MySQL/*/include
       $ENV{SystemDrive}/MySQL/*/include)
 
@@ -41,6 +43,8 @@ ELSE()
       /usr/lib/mysql
       /usr/local/lib/mysql
       /opt/local/lib/mysql5/mysql
+      /opt/local/lib/mysql55/mysql
+      /opt/local/lib/mysql51/mysql
       )
 
     FIND_LIBRARY(MYSQL_LIBRARY_DEBUG NAMES mysqlclientd
@@ -50,6 +54,8 @@ ELSE()
       /usr/lib/mysql
       /usr/local/lib/mysql
       /opt/local/lib/mysql5/mysql
+      /opt/local/lib/mysql55/mysql
+      /opt/local/lib/mysql51/mysql
       )
   ENDIF()