- Commit merged changes

modified:
  mysql-test/mysql-test-run.pl
  storage/connect/CMakeLists.txt

mysql-test/mysql-test-run.pl

@@ -377,7 +377,7 @@ sub main {
   # directly before it executes them, like "make test-force-pl" in RPM builds.
   mtr_report("Logging: $0 ", join(" ", @ARGV));
 
-  $DEFAULT_SUITES.=",sequence,sql_discovery" if $source_dist;
+  $DEFAULT_SUITES.=",sequence,sql_discovery,connect" if $source_dist;
 
   command_line_setup();
 

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(
 "