bk commit into 6.0 tree (rafal:1.2769) WL#4212

[rsomla]

Below is the list of changes that have just been committed into a local
6.0 repository of rafal. When rafal 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-03-04 18:30:51+01:00, rafal@quant.(none) +3 -0
  WL#4212 (Online Backup : Kernel updates for object metadata changes)
  
  Post review fixes.

  sql/backup/backup_aux.h@stripped, 2008-03-04 18:30:47+01:00, rafal@quant.(none) +2 -2
    Removed outdated FIXME.

  sql/backup/data_backup.cc@stripped, 2008-03-04 18:30:47+01:00, rafal@quant.(none) +0 -1
    Removed outdated FIXME (it makes no sense here as no buffer is allocated any more).

  sql/backup/kernel.cc@stripped, 2008-03-04 18:30:47+01:00, rafal@quant.(none) +10 -9
    Fix typo in a comment and update documentation of build_table_list().

diff -Nrup a/sql/backup/backup_aux.h b/sql/backup/backup_aux.h
--- a/sql/backup/backup_aux.h	2008-02-27 21:04:08 +01:00
+++ b/sql/backup/backup_aux.h	2008-03-04 18:30:47 +01:00
@@ -88,11 +88,11 @@ class String: public ::String
   {}
 
   String(const ::LEX_STRING &s)
-    : ::String(s.str, s.length, &::my_charset_bin) // FIXME: charset info
+    : ::String(s.str, s.length, &::my_charset_bin)
   {}
 
   String(byte *begin, byte *end)
-    : ::String((char*)begin, end - begin, &::my_charset_bin) // FIXME: charset info
+    : ::String((char*)begin, end - begin, &::my_charset_bin)
   {
     if (!begin)
      set((char*)NULL, 0, NULL);
diff -Nrup a/sql/backup/data_backup.cc b/sql/backup/data_backup.cc
--- a/sql/backup/data_backup.cc	2008-02-27 21:04:09 +01:00
+++ b/sql/backup/data_backup.cc	2008-03-04 18:30:47 +01:00
@@ -278,7 +278,6 @@ class Scheduler::Pump: public Backup_pum
 
  public:
 
-  // FIXME: how to react if the buffer could not be allocated?
   Pump(Snapshot_info &snap, Output_stream &s)
     :Backup_pump(snap, bw), start_pos(0),
     bw(snap.m_num - 1, DATA_BUFFER_SIZE, s)
diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc	2008-02-27 21:04:09 +01:00
+++ b/sql/backup/kernel.cc	2008-03-04 18:30:47 +01:00
@@ -441,8 +441,7 @@ int Backup_restore_ctx::prepare(LEX_STRI
   @note It is important that changes of meta-data are blocked as part of the
   preparations. The set of server objects and their definitions should not
   change after the backup context has been prepared and before the actual backup
-  is performed using @c do_backup() method. In particular, meta-data should be 
-  frozen when 
+  is performed using @c do_backup() method.
  */ 
 Backup_info* Backup_restore_ctx::prepare_for_backup(LEX_STRING location)
 {
@@ -1436,16 +1435,18 @@ int bcat_get_item_create_data(st_bstream
 
 namespace backup {
 
-/// Build linked @c TABLE_LIST list from a list stored in @c Table_list object.
+/** 
+  Build linked @c TABLE_LIST list from a list stored in @c Table_list object.
+ 
+  @note The order of tables in the returned list is different than in the 
+  input list (reversed).
+
+  @todo Decide what to do if errors are detected. For example, how to react
+  if memory for TABLE_LIST structure could not be allocated?
+ */
 TABLE_LIST *build_table_list(const Table_list &tables, thr_lock_type lock)
 {
   TABLE_LIST *tl= NULL;
-
-  /*
-    FIXME: build list with the same order as in input
-    Actually, should work fine with reversed list as long as we use the reversed
-    list both in table writing and reading.
-   */
 
   for( uint tno=0; tno < tables.count() ; tno++ )
   {