bk commit into 6.0 tree (rafal:1.2610) WL#4347

[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-04-17 15:28:29+02:00, rafal@quant.(none) +2 -0
  Final updates after pulling changes from mysql-6.0-backup merge tree. 
  After this patch the mysql-6.0-backup tree is ready to receive WL#4347
  patch and support tablespaces. Before that happens the backup_tablespace
  test must be disabled and a stub for tablespace iterator added to the
  backup kernel.

  mysql-test/t/disabled.def@stripped, 2008-04-17 15:28:22+02:00, rafal@quant.(none) +1 -0
    Disable backup_tablespace test until WL#4347 is pushed.

  sql/backup/kernel.cc@stripped, 2008-04-17 15:28:22+02:00, rafal@quant.(none) +1 -0
    Add null tablespace iterator so that backup stream code (which now supports tablespaces) works.

diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-04-13 11:23:59 +02:00
+++ b/mysql-test/t/disabled.def	2008-04-17 15:28:22 +02:00
@@ -31,6 +31,7 @@ backup_progress       :BUG#34235 pending
 backup_security       :BUG#34235 pending replacement of test facility with WL#4259
 backup_snapshot       :BUG#34235 pending replacement of test facility with WL#4259
 backup_no_engine     : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
+backup_tablespace    : WL#4347 2008-04-17 rsomla must wait for WL to get tablespace support in the backup kernel
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
 ctype_latin2_ch      : BUG #33791 2008-01-18 mats Wrong ORDER BY with latin2_czech_cs
 
diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc	2008-04-17 12:44:36 +02:00
+++ b/sql/backup/kernel.cc	2008-04-17 15:28:22 +02:00
@@ -1167,6 +1167,7 @@ void* bcat_iterator_get(st_bstream_image
   switch (type) {
 
   case BSTREAM_IT_PERTABLE: // per-table objects
+  case BSTREAM_IT_TABLESPACE: // tablespaces - not supported yet
     return &null_iter;
 
   case BSTREAM_IT_CHARSET:  // character sets