Merge from maria-10.0

modified:
  storage/connect/CMakeLists.txt
  Alexander Barkov 2013-04-28 Fixing that ODBC detection always failed on ...

storage/connect/CMakeLists.txt

@@ -236,6 +236,7 @@ IF(CONNECT_WITH_ODBC)
     )
 
     IF(ODBC_INCLUDE_DIR AND ODBC_LIBRARY)
+      set(CMAKE_REQUIRED_LIBRARIES ${ODBC_LIBRARY})
       set(CMAKE_REQUIRED_INCLUDES ${ODBC_INCLUDE_DIR})
       CHECK_CXX_SOURCE_COMPILES(
 "