diff -urN mysql-connector-c++-1.1.5/FindMySQL.cmake mysql-connector-c++-1.1.5-mgalib/FindMySQL.cmake
--- mysql-connector-c++-1.1.5/FindMySQL.cmake	2014-11-19 06:37:11.000000000 -0700
+++ mysql-connector-c++-1.1.5-mgalib/FindMySQL.cmake	2015-02-20 13:07:54.731407654 -0700
@@ -490,80 +490,23 @@
 #
 ##########################################################################
 
-if(FINDMYSQL_DEBUG AND MYSQL_INCLUDE_DIR)
-  message("DBG: User gave MYSQL_INCLUDE_DIR = \"${MYSQL_INCLUDE_DIR}\"")
-endif()
-
-if(FINDMYSQL_DEBUG AND MYSQL_DIR)
-  message("DBG: User gave MYSQL_DIR = \"${MYSQL_DIR}\"")
-endif()
-
-if(MYSQL_INCLUDE_DIR)
-
-  if(FINDMYSQL_DEBUG)
-    message("DBG: Using MYSQL_INCLUDE_DIR to find \"mysql.h\"")
-  endif()
-
-  if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
-    message(FATAL_ERROR "MYSQL_INCLUDE_DIR given, but no \"mysql.h\" "
-                        "in \"${MYSQL_INCLUDE_DIR}\"")
-  endif()
-
-elseif(MYSQL_DIR AND
-       (NOT _mysql_config_in_mysql_dir) AND
-       (NOT _mysql_config_set_by_user))
-
-  if(FINDMYSQL_DEBUG)
-    message("DBG: Using MYSQL_DIR without \"mysql_config\" to find \"mysql.h\"")
-  endif()
-
-  set(MYSQL_INCLUDE_DIR "${MYSQL_DIR}/include")
-  if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
-    message(FATAL_ERROR "MYSQL_DIR given, but no \"mysql.h\" "
-                        "in \"${MYSQL_INCLUDE_DIR}\"")
-  endif()
-
-elseif(MYSQL_CONFIG_EXECUTABLE)
-
-  if(FINDMYSQL_DEBUG)
-    message("DBG: Using \"mysql_config\" to find \"mysql.h\"")
-  endif()
-
-  # This code assumes there is just one "-I...." and that
-  # no space between "-I" and the path
-  _mysql_config(MYSQL_INCLUDE_DIR "(^| )-I" "--include")
-  if(NOT MYSQL_INCLUDE_DIR)
-    message(FATAL_ERROR "Could not find the include dir from running "
-                        "\"${MYSQL_CONFIG_EXECUTABLE}\"")
-  endif()
-
-  if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
-    message(FATAL_ERROR "Could not find \"mysql.h\" in \"${MYSQL_INCLUDE_DIR}\" "
-                        "found from running \"${MYSQL_CONFIG_EXECUTABLE}\"")
-  endif()
-
-else()
-
-  if(FINDMYSQL_DEBUG)
-    message("DBG: Using find_path() searching "
-            "\"${_pp_include_fallback_path}\" to find \"mysql.h\"")
-  endif()
-
-  # No specific paths, try some common install paths
-  find_path(_found_header mysql.h ${_include_fallback_path})
-
-  if(NOT _found_header)
-    message(FATAL_ERROR "Could not find \"mysql.h\" from searching "
-                        "\"${_pp_include_fallback_path}\"")
-  endif()
-
-  get_filename_component(MYSQL_INCLUDE_DIR ${_found_header} PATH)
-
-endif()
-
-if(FINDMYSQL_DEBUG)
-  message("DBG: MYSQL_INCLUDE_DIR = \"${MYSQL_INCLUDE_DIR}\"")
-endif()
+IF(NOT MYSQL_INCLUDE_DIR AND MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+  _MYSQL_CONFIG(MYSQL_INCLUDE_DIR "(^| )-I" "--include")
+ELSE(NOT MYSQL_INCLUDE_DIR AND MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+  MESSAGE(STATUS "ENV{MYSQL_DIR} = $ENV{MYSQL_DIR}")
+  FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
+    ${MYSQL_INCLUDE_DIR}
+    $ENV{MYSQL_INCLUDE_DIR}
+    $ENV{MYSQL_DIR}/include
+    /usr/include/mysql
+    /usr/local/include/mysql
+    /opt/mysql/mysql/include
+    /opt/mysql/mysql/include/mysql
+    /usr/local/mysql/include
+    /usr/local/mysql/include/mysql
+    $ENV{ProgramFiles}/MySQL/*/include
+    $ENV{SystemDrive}/MySQL/*/include)
+ENDIF(NOT MYSQL_INCLUDE_DIR AND MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
 
 ##########################################################################
 #