Below is the list of changes that have just been committed into a local
5.2 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-10-03 15:38:23-04:00, cbell@mysql_cab_desk. +2 -0
WL#3327 : Online Backup
This patch modifies the cmake files so that the backup source files are in its
own project file.
sql/CMakeLists.txt@stripped, 2007-10-03 15:38:19-04:00, cbell@mysql_cab_desk. +4 -4
WL#3327 : Online Backup
This patch modifies the cmake file for the mysqld project to separate the backup
source files into its own project file.
sql/backup/CMakeLists.txt@stripped, 2007-10-03 15:38:20-04:00, cbell@mysql_cab_desk. +32 -0
WL#3327 : Online Backup
This patch adds a cmake file for the backup source files so that it is in its
own project file.
sql/backup/CMakeLists.txt@stripped, 2007-10-03 15:38:20-04:00, cbell@mysql_cab_desk. +0 -0
diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt 2007-08-26 16:43:16 -04:00
+++ b/sql/CMakeLists.txt 2007-10-03 15:38:19 -04:00
@@ -76,10 +76,6 @@ ADD_EXECUTABLE(mysqld
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
rpl_rli.cc rpl_mi.cc sql_servers.cc
sql_connect.cc scheduler.cc
- backup/stream.cc backup/logger.cc backup/string_pool.cc
- backup/archive.cc backup/meta_backup.cc backup/data_backup.cc
- backup/sql_backup.cc backup/be_default.cc backup/buffer_iterator.cc
- backup/be_snapshot.cc
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
${PROJECT_SOURCE_DIR}/include/mysqld_error.h
@@ -93,6 +89,8 @@ TARGET_LINK_LIBRARIES(mysqld
heap myisam myisammrg mysys yassl zlib debug dbug yassl
taocrypt strings vio regex wsock32 ws2_32)
+TARGET_LINK_LIBRARIES(mysqld backup)
+
SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
# Work around for 2.4.6 bug, OUTPUT_NAME will not set the right .PDB
@@ -172,3 +170,5 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDI
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
ADD_DEPENDENCIES(udf_example strings)
TARGET_LINK_LIBRARIES(udf_example wsock32)
+
+ADD_SUBDIRECTORY(backup)
diff -Nrup a/sql/backup/CMakeLists.txt b/sql/backup/CMakeLists.txt
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/sql/backup/CMakeLists.txt 2007-10-03 15:38:20 -04:00
@@ -0,0 +1,32 @@
+# 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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/sql/backup
+ ${CMAKE_SOURCE_DIR}/regex
+ ${CMAKE_SOURCE_DIR}/extra/yassl/include)
+
+SET(BACKUP_SOURCES stream.cc logger.cc string_pool.cc
+ archive.cc meta_backup.cc data_backup.cc
+ sql_backup.cc be_default.cc buffer_iterator.cc
+ be_snapshot.cc)
+
+IF(NOT SOURCE_SUBLIBS)
+ ADD_LIBRARY(backup ${BACKUP_SOURCES})
+ENDIF(NOT SOURCE_SUBLIBS)
| Thread |
|---|
| • bk commit into 5.2 tree (cbell:1.2604) | cbell | 3 Oct |
