diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-30 15:35:01 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-30 15:35:01 +0200 |
| commit | eaba74fee5611369c02e50eb6da707f8f29cf302 (patch) | |
| tree | 7f9c3b3991fa7d5f18931f146c63848ea7405fd6 /client/CMakeLists.txt | |
| parent | b73763e0f913a1b3e841cbe91f9d11802cbf054c (diff) | |
| download | mariadb-git-eaba74fee5611369c02e50eb6da707f8f29cf302.tar.gz | |
Backport http://lists.mysql.com/commits/57778
2677 Vladislav Vaintroub 2008-11-04
CMakeLists.txt files cleanup
- remove SAFEMALLOC and SAFE_MUTEX definitions that were
present in *each* CMakeLists.txt. Instead, put them into top level
CMakeLists.txt, but disable on Windows, because
a) SAFEMALLOC does not add any functionality that is not already
present in Debug C runtime ( and 2 safe malloc one on top of the other
only unnecessarily slows down the server)
b)SAFE_MUTEX does not work on Windows and have been
explicitely disabled on Windows with #undef previously. Fortunately,
ntdll does pretty good job identifying l problems with
CRITICAL_SECTIONs.
DebugBreak()s on using uninited critical section, unlocking unowned
critical section)
-Also, remove occationally used -D_DEBUG (added by compiler
anyway)
sql/udf_example.c:
use unixish end of line
Diffstat (limited to 'client/CMakeLists.txt')
| -rwxr-xr-x | client/CMakeLists.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 176613e2dc8..28e4c354a69 100755 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -14,13 +14,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") -# We use the "mysqlclient" library here just as safety, in case -# any of the clients here would go beyond the client API and access the -# Thread Local Storage directly. - -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/extra/yassl/include |