bk commit into 6.0 tree (cbell:1.2648)

[cbell]

Below is the list of changes that have just been committed into a local
6.0 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-11-07 15:37:49-05:00, cbell@mysql_cab_desk. +1 -0
  Add online backup to 6.0. 
  
  This patch corrects a missing change to the cmake file in ./sql to properly
  generate the visual studio project file as a separate compile.

  sql/CMakeLists.txt@stripped, 2007-11-07 15:37:37-05:00, cbell@mysql_cab_desk. +4 -4
    Add online backup to 6.0. 
    
    This patch corrects a missing change to the cmake file in ./sql to properly
    generate the visual studio project file as a separate compile.

diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-11-06 13:31:58 -05:00
+++ b/sql/CMakeLists.txt	2007-11-07 15:37:37 -05: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
@@ -177,4 +175,6 @@ 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 strings wsock32)
+
+ADD_SUBDIRECTORY(backup)