mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
- Commit merged changes
modified: mysql-test/mysql-test-run.pl storage/connect/CMakeLists.txt
This commit is contained in:
commit
3c76e0e2ad
2 changed files with 2 additions and 1 deletions
|
@ -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();
|
||||
|
||||
|
|
|
@ -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(
|
||||
"
|
||||
|
|
Loading…
Reference in a new issue