bk commit into 5.1 tree (rafal:1.2507)

[rsomla]

Below is the list of changes that have just been committed into a local
5.1 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, 2007-04-11 21:47:02+02:00, rafal@quant.(none) +1 -0
  Merge rsomla@bk-internal:/home/bk/mysql-5.1-backup-prototype
  into  quant.(none):/ext/mysql/bk/backup/prototype
  MERGE: 1.2505.1.1

  sql/backup/sql_backup.cc@stripped, 2007-04-11 21:46:57+02:00, rafal@quant.(none) +0 -0
    Auto merged
    MERGE: 1.16.1.1

# 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:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/backup/prototype/RESYNC

--- 1.17/sql/backup/sql_backup.cc	2007-04-11 21:47:07 +02:00
+++ 1.18/sql/backup/sql_backup.cc	2007-04-11 21:47:07 +02:00
@@ -35,9 +35,9 @@
 bool write_header(const Backup_info&,OStream&);
 bool write_catalog(const Backup_info&,OStream&);
 bool write_table_data(const Backup_info&,OStream&);
-bool get_table_metadata(THD *thd, TABLE_LIST *tbl, 
+bool get_table_metadata(THD *thd, TABLE_LIST *tbl,
                         List<String> *buffer);
-bool get_db_metadata(THD *thd, const char *db, 
+bool get_db_metadata(THD *thd, const char *db,
                      List<String> *buffer);
 
 /*
@@ -74,8 +74,8 @@
   Backup_info  info;
   info.db_list= db_list;
   List_iterator<LEX_STRING> db_names(*info.db_list);
-  LEX_STRING *dbstr= db_names++; 
-  if (!my_strcasecmp(system_charset_info, 
+  LEX_STRING *dbstr= db_names++;
+  if (!my_strcasecmp(system_charset_info,
          dbstr->str, "*"))
   {
     info.db_list->empty();
@@ -203,7 +203,7 @@
         create a new catalog struct
         fill with tables and their metadata
         add catalog to list
-  */  
+  */
   List_iterator<LEX_STRING> databases(*info.db_list);
 
   table_info *ti;
@@ -222,15 +222,15 @@
     DBUG_PRINT("backup", ("Database metadata created."));
 
     ha->ha_rnd_init(TRUE);
- 
+
     // TODO: use conditions, do it properly
     while( ! ha->rnd_next(i_s_tables->record[0]) )
     {
       Table tbl(i_s_tables);
       db_name= tbl.db().name();
-      if (tbl && !my_strcasecmp(system_charset_info, 
+      if (tbl && !my_strcasecmp(system_charset_info,
          db_name.c_ptr(), tmp->str) &&
-         my_strcasecmp(system_charset_info, 
+         my_strcasecmp(system_charset_info,
          db_name.c_ptr(), "information_schema"))
       {
         DBUG_PRINT("backup", ("Found table %s for database %s",
@@ -247,9 +247,9 @@
         /*
           Get the metadata for the table
         */
-        TABLE_LIST *ptr= 
+        TABLE_LIST *ptr=
           build_table_list_str((char *)tbl.name().ptr(), db_name.c_ptr(), TL_READ);
-        get_table_metadata(thd, ptr, &ti->table_metadata); 
+        get_table_metadata(thd, ptr, &ti->table_metadata);
         /*
           Save the table_info to the tables list for this database
         */
@@ -296,7 +296,7 @@
   {
     db_name.length(0);
     db_table->field[1]->val_str(&db_name);
-    if (my_strcasecmp(system_charset_info, 
+    if (my_strcasecmp(system_charset_info,
        db_name.c_ptr(), "information_schema"))
     {
       DBUG_PRINT("backup", ("Found database %s", db_name.ptr()));
@@ -438,7 +438,7 @@
   DESCRIPTION
     This procedure opens the archive and extracts the metadata
     for the databases and tables stored in the archive. A simple
-    list of the tables by database is sent to the client. 
+    list of the tables by database is sent to the client.
 
   RETURNS
     0  - no errors.
@@ -464,7 +464,7 @@
     DBUG_RETURN(-1);
 
   // for debug purposes -- grep for 'stream: ' in server trace
-  dump_stream(*backup_str); 
+  dump_stream(*backup_str);
 
   backup_str->rewind();
   DBUG_ASSERT( read_header(*backup_str,info) );
@@ -473,7 +473,7 @@
 
   // send catalog to client
 
-  /* 
+  /*
     Loop through the catalog and list the contents by
     database.
   */
@@ -697,7 +697,7 @@
     If reading, file must exist.
     If writing, path must exist.
   */
-  if (read)
+/*  if (read)
   {
     if (my_access(where.str, F_OK) || (length == where.length))
     {
@@ -710,11 +710,11 @@
   {
     if (my_access(buff, (F_OK|W_OK)))
     {
-      my_error(ER_CANT_CREATE_FILE, MYF(0), where.str, 
+      my_error(ER_CANT_CREATE_FILE, MYF(0), where.str,
                ER_CANT_CREATE_FILE);
       return NULL;
     }
-  }
+  } */
   return new File_loc(where.str);
 }
 
@@ -774,7 +774,7 @@
 
   /* restore wild field */
   thd->lex= saved_lex;
- 
+
   return t;
 }