From 2d33547475ced9604d26c1e41298a87dfd44d015 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sun, 28 Apr 2013 10:18:31 +0400 Subject: [PATCH 1/2] Fixing that ODBC detection always failed on Linux because set(CMAKE_REQUIRED_INCLUDES ${ODBC_INCLUDE_DIR}) was missing before the recently added CHECK_CXX_SOURCE_COMPILES() modified: storage/connect/CMakeLists.txt --- storage/connect/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 63943aaa03b..4f02924d6b3 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -234,6 +234,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( " From 53e2023952d74e0b0dc76160c3a1ba5ee30f098c Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 13 May 2013 13:35:56 +0400 Subject: [PATCH 2/2] Enabling --suite=connect by default modified: mysql-test/mysql-test-run.pl --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a6780b5038c..47a3ccfc6d8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/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();