bk commit into 6.0 tree (rafal:1.2711)

[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, 2007-11-30 19:20:37+01:00, rafal@quant.(none) +3 -0
  Fixes for win build on pb.

  sql/backup/kernel.cc@stripped, 2007-11-30 19:20:34+01:00, rafal@quant.(none) +2 -2
    To disambiguate - otherwise win compiler errors.

  sql/backup/meta_data.cc@stripped, 2007-11-30 19:20:34+01:00, rafal@quant.(none) +1 -1
    To disambiguate - otherwise win compiler errors.

  sql/backup/stream_v1_transport.c@stripped, 2007-11-30 19:20:34+01:00, rafal@quant.(none) +1
-2
    Move declaration up since win compiler doesn't accept it elsewhere.

diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc	2007-11-30 16:54:19 +01:00
+++ b/sql/backup/kernel.cc	2007-11-30 19:20:34 +01:00
@@ -111,7 +111,7 @@ execute_backup_command(THD *thd, LEX *le
   case SQLCOM_SHOW_ARCHIVE:
   case SQLCOM_RESTORE:
   {
-    IStream *stream= open_for_read(*loc);
+    backup::IStream *stream= open_for_read(*loc);
 
     if (!stream)
     {
@@ -221,7 +221,7 @@ execute_backup_command(THD *thd, LEX *le
 
   case SQLCOM_BACKUP:
   {
-    OStream *stream= open_for_write(*loc);
+    backup::OStream *stream= open_for_write(*loc);
 
     // TODO: report error if location exists
 
diff -Nrup a/sql/backup/meta_data.cc b/sql/backup/meta_data.cc
--- a/sql/backup/meta_data.cc	2007-11-30 16:54:19 +01:00
+++ b/sql/backup/meta_data.cc	2007-11-30 19:20:34 +01:00
@@ -84,7 +84,7 @@ int bcat_get_item_create_query(st_bstrea
   if (res != OK)
     return BSTREAM_ERROR;
 
-  stmt->begin= (byte*)info->create_stmt_buf.ptr();
+  stmt->begin= (backup::byte*)info->create_stmt_buf.ptr();
   stmt->end= stmt->begin + info->create_stmt_buf.length();
 
   return BSTREAM_OK;
diff -Nrup a/sql/backup/stream_v1_transport.c b/sql/backup/stream_v1_transport.c
--- a/sql/backup/stream_v1_transport.c	2007-11-29 20:57:01 +01:00
+++ b/sql/backup/stream_v1_transport.c	2007-11-30 19:20:34 +01:00
@@ -1296,6 +1296,7 @@ static
 int check_end(backup_stream *s)
 {
   int ret;
+  bool eoc_seen= FALSE;
 
   if (s->state == ERROR)
     return BSTREAM_ERROR;
@@ -1315,8 +1316,6 @@ int check_end(backup_stream *s)
     Note: in each iteration of this loop one byte of the stream is consumed,
     hence it must terminate eventually.
   */
-
-  bool eoc_seen= FALSE;
 
   while(TRUE)
   {