diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /CMakeLists.txt | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69fbf9f73b1..2c19f2b5059 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,6 +105,10 @@ IF(CYBOZU) ADD_DEFINITIONS(-DCYBOZU) ENDIF(CYBOZU) +IF(EXTRA_DEBUG) + ADD_DEFINITIONS(-D EXTRA_DEBUG) +ENDIF(EXTRA_DEBUG) + # in some places we use DBUG_OFF SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") @@ -269,3 +273,4 @@ IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) +ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) |