MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:November 13 2009 11:21am
Subject:bzr commit into mysql-pe branch (jorgen.loland:3680)
View as plain text  
#At file:///localhome/jl208045/mysql/mysql-5.1-branches/mysql-pe/ based on revid:anurag.shekhar@stripped

 3680 Jorgen Loland	2009-11-13 [merge]
      Merging 5.1-bugfixing to mysql-pe. Changesets seem to have been applied but without reflecting the revision number in pe.

    modified:
      storage/archive/CMakeLists.txt*
      storage/federated/CMakeLists.txt*
=== modified file 'storage/archive/CMakeLists.txt' (properties changed: -x to +x)
--- a/storage/archive/CMakeLists.txt	2009-08-18 11:04:32 +0000
+++ b/storage/archive/CMakeLists.txt	2009-11-13 11:20:48 +0000
@@ -13,6 +13,9 @@
 # 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 "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+
 INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
 SET(ARCHIVE_SOURCES  azio.c ha_archive.cc ha_archive.h)
 MYSQL_STORAGE_ENGINE(ARCHIVE)

=== modified file 'storage/federated/CMakeLists.txt' (properties changed: -x to +x)
--- a/storage/federated/CMakeLists.txt	2009-08-18 11:04:32 +0000
+++ b/storage/federated/CMakeLists.txt	2009-11-13 11:20:48 +0000
@@ -1,18 +1,21 @@
 # Copyright (C) 2006 MySQL AB
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # 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 "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+
 INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
 SET(FEDERATED_SOURCES  ha_federated.cc)
 MYSQL_STORAGE_ENGINE(FEDERATED)


Attachment: [text/bzr-bundle] bzr/jorgen.loland@sun.com-20091113112048-rc50ts02846wu6d1.bundle
Thread
bzr commit into mysql-pe branch (jorgen.loland:3680) Jorgen Loland13 Nov