diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-29 18:42:50 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-29 18:42:50 +0500 |
commit | d812bcb9551856e872a3232ebbe6a2cd8c376005 (patch) | |
tree | cc7620ed1a2c650710f867868996b3131a503f1e /CMakeLists.txt | |
parent | 56c184503cdbcbbdca808b178bb0861c055c6d9c (diff) | |
parent | 7eb77da33a7da7c56053164793012f1091048350 (diff) | |
download | mariadb-git-d812bcb9551856e872a3232ebbe6a2cd8c376005.tar.gz |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
CMakeLists.txt:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/innodb_mysql.result:
merging
mysql-test/t/innodb_mysql.test:
merging
Diffstat (limited to 'CMakeLists.txt')
-rwxr-xr-x | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fcbd3f4e4bd..68238ea157c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,10 @@ ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE) ADD_DEFINITIONS(-D CMAKE_BUILD) ADD_DEFINITIONS(-D HAVE_YASSL) +# Set debug options +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") +SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DFORCE_INIT_OF_VARS") + SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin") |