bk commit into 5.1 tree (cbell:1.2489)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 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-03-21 15:24:00-04:00, cbell@mysql_cab_desk. +3 -0
  Changes to cmake files for code reorg.

  CMakeLists.txt@stripped, 2007-03-21 15:23:56-04:00, cbell@mysql_cab_desk. +1 -0
    Changes to incorporate source code reorg

  sql/CMakeLists.txt@stripped, 2007-03-21 15:23:57-04:00, cbell@mysql_cab_desk. +2 -2
    Changes needed for code reorg

  sql/backup/CMakeLists.txt@stripped, 2007-03-21 15:17:06-04:00, cbell@mysql_cab_desk. +34 -0
    BitKeeper file C:/source/c++/mysql-5.1_WL_3570/sql/backup/CMakeLists.txt

  sql/backup/CMakeLists.txt@stripped, 2007-03-21 15:17:06-04:00, cbell@mysql_cab_desk. +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.1_WL_3570
--- New file ---
+++ sql/backup/CMakeLists.txt	07/03/21 15:17:06
# 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")

# The old Windows build method used renamed (.cc -> .cpp) source files, fails
# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define.
ADD_DEFINITIONS(-DUSING_CMAKE)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                    ${CMAKE_SOURCE_DIR}/zlib 
                    ${CMAKE_SOURCE_DIR}/extra/yassl/include 
                    ${CMAKE_SOURCE_DIR}/libmysql
                    ${CMAKE_SOURCE_DIR}/regex
                    ${CMAKE_SOURCE_DIR}/sql
                    ${CMAKE_SOURCE_DIR}/strings)

ADD_LIBRARY(backup archive.cc be_default.cc data_backup.cc meta_backup.cc sql_backup.cc
stream.cc string_pool.cc tables.cc)

ADD_DEFINITIONS(-DHAVE_DLOPEN)

ADD_DEPENDENCIES(backup vio)


--- 1.25/CMakeLists.txt	2007-03-21 15:24:12 -04:00
+++ 1.26/CMakeLists.txt	2007-03-21 15:24:12 -04:00
@@ -139,6 +139,7 @@
 ADD_SUBDIRECTORY(storage/myisam)
 ADD_SUBDIRECTORY(storage/myisammrg)
 ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(sql/backup)
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/archive)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

--- 1.36/sql/CMakeLists.txt	2007-03-21 15:24:12 -04:00
+++ 1.37/sql/CMakeLists.txt	2007-03-21 15:24:12 -04:00
@@ -23,6 +23,7 @@
                     ${CMAKE_SOURCE_DIR}/sql 
                     ${CMAKE_SOURCE_DIR}/regex 
                     ${CMAKE_SOURCE_DIR}/zlib
+                    ${CMAKE_SOURCE_DIR}/backup
 )
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 
@@ -70,8 +71,6 @@
                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.cc backup_util.cc backup_prototype.cc backup_alg.cc restore_alg.cc
-               default_driver.cc 
                ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
   			   ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
 			   ${PROJECT_SOURCE_DIR}/include/mysqld_error.h
@@ -102,6 +101,7 @@
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 
 ADD_DEPENDENCIES(mysqld GenError)
+ADD_DEPENDENCIES(mysqld backup)
 
 # Sql Parser custom command
 ADD_CUSTOM_COMMAND(