bk commit into 5.2 tree (antony:1.2584)

[antony]

Below is the list of changes that have just been committed into a local
5.2 repository of antony. When antony 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-08-26 05:53:55-07:00, antony@stripped +1 -0
  post merge fixes
  restore missing windows changes

  sql/CMakeLists.txt@stripped, 2007-08-26 05:53:51-07:00, antony@stripped +5 -0
    post merge fixes
    restore missing windows changes

diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-08-03 13:55:30 -07:00
+++ b/sql/CMakeLists.txt	2007-08-26 05:53:51 -07:00
@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/sql 
                     ${CMAKE_SOURCE_DIR}/regex 
                     ${CMAKE_SOURCE_DIR}/zlib
+                    ${CMAKE_SOURCE_DIR}/sql/backup
 )
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 
@@ -75,6 +76,10 @@ ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX
                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