Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint

into recycle.(none):/src/bug25765/my51-bug25765

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into recycle.(none):/src/bug25765/my51-bug25765
cd686bf7 · iggy@recycle.(none) · 41bdc9c1 · ebbd5525 · cd686bf7
Commit cd686bf7 authored Mar 20, 2007 by iggy@recycle.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/innobase/CMakeLists.txt storage/innobase/CMakeLists.txt +2 -2

No files found.
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -13,8 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

-#SET(CMAKE_CXX_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
-#SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)

 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib