bk commit into 6.0 tree (cbell:1.2756) WL#3574

[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, 2008-01-09 18:53:55-05:00, cbell@mysql_laptop. +4 -0
  WL#3574 : Online backup: Service API for Metadata Objects II
  
  Adds the source file for si_objects.

  sql/backup/CMakeLists.txt@stripped, 2008-01-09 18:53:46-05:00, cbell@mysql_laptop. +2 -1
    WL#3574 : Online backup: Service API for Metadata Objects II
    
    Adds si_objects.cc to cmake list.

  sql/backup/Makefile.am@stripped, 2008-01-09 18:53:47-05:00, cbell@mysql_laptop. +2 -1
    WL#3574 : Online backup: Service API for Metadata Objects II
    
    Adds si_object.cc to makefile.

  sql/backup/si_objects.cc@stripped, 2008-01-09 18:53:49-05:00, cbell@mysql_laptop. +16 -0
    WL#3574 : Online backup: Service API for Metadata Objects II
    
    New source file.

  sql/backup/si_objects.cc@stripped, 2008-01-09 18:53:49-05:00, cbell@mysql_laptop. +0 -0

  sql/backup/si_objects.h@stripped, 2008-01-09 18:53:48-05:00, cbell@mysql_laptop. +2 -0
    WL#3574 : Online backup: Service API for Metadata Objects II
    
    Adds includes for compilation of header.

diff -Nrup a/sql/backup/CMakeLists.txt b/sql/backup/CMakeLists.txt
--- a/sql/backup/CMakeLists.txt	2007-11-30 03:28:56 -05:00
+++ b/sql/backup/CMakeLists.txt	2008-01-09 18:53:46 -05:00
@@ -25,7 +25,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
 SET(BACKUP_SOURCES stream.cc logger.cc kernel.cc
                catalog.cc meta_data.cc data_backup.cc
                be_default.cc buffer_iterator.cc
-               be_snapshot.cc be_thread.cc backup_progress.cc)
+               be_snapshot.cc be_thread.cc backup_progress.cc
+               si_objects.cc)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(backup ${BACKUP_SOURCES})
diff -Nrup a/sql/backup/Makefile.am b/sql/backup/Makefile.am
--- a/sql/backup/Makefile.am	2007-11-30 04:02:56 -05:00
+++ b/sql/backup/Makefile.am	2008-01-09 18:53:47 -05:00
@@ -36,7 +36,8 @@ libbackup_la_SOURCES = \
   be_snapshot.cc \
   buffer_iterator.cc \
   be_thread.cc \
-  backup_progress.cc
+  backup_progress.cc \
+  si_objects.cc
 
 libbackup_la_LIBADD = libbackupstream.la
 
diff -Nrup a/sql/backup/si_objects.cc b/sql/backup/si_objects.cc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/sql/backup/si_objects.cc	2008-01-09 18:53:49 -05:00
@@ -0,0 +1,16 @@
+/**
+   @file si_objects.cc
+ 
+   This file defines the API for the following object services:
+     - getting CREATE statements for objects
+     - generating GRANT statments for objects
+     - enumerating objects
+     - finding dependencies for objects
+     - executor for SQL statments
+     - wrappers for controlling the DDL Blocker
+
+  The methods defined below are used to provide server functionality to
+  and permitting an isolation layer for the client (caller).
+ */ 
+
+#include "si_objects.h"
diff -Nrup a/sql/backup/si_objects.h b/sql/backup/si_objects.h
--- a/sql/backup/si_objects.h	2008-01-09 18:42:03 -05:00
+++ b/sql/backup/si_objects.h	2008-01-09 18:53:48 -05:00
@@ -16,6 +16,8 @@
   and permitting an isolation layer for the client (caller).
  */ 
 
+#include "mysql_priv.h"
+
 /*
   Object Service: Create info methods