bk commit into 6.0 tree (rafal:1.2578) 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-06 12:20:49+01:00, rafal@quant.(none) +3 -0
  WL#4212
  
  Fixing problems which showed up when compiling this code on Win platform.

  sql/backup/backup_kernel.h@stripped, 2008-03-06 12:20:45+01:00, rafal@quant.(none) +1 -1
    Correct type of m_thd_options to match that of THD::options.

  sql/backup/kernel.cc@stripped, 2008-03-06 12:20:45+01:00, rafal@quant.(none) +3 -3
    - Apparently, there is no ||= operator in C/C++.
    - Disambiguate 'byte' type - needed on Win platform which has its own 'byte' type.

  sql/backup/logger.h@stripped, 2008-03-06 12:20:45+01:00, rafal@quant.(none) +1 -1
    Correct type of m_op_id to the one used in backup_progress.{h,cc}.

diff -Nrup a/sql/backup/backup_kernel.h b/sql/backup/backup_kernel.h
--- a/sql/backup/backup_kernel.h	2008-03-04 17:06:22 +01:00
+++ b/sql/backup/backup_kernel.h	2008-03-06 12:20:45 +01:00
@@ -90,7 +90,7 @@ class Backup_restore_ctx: public backup:
          PREPARED_FOR_RESTORE,
          CLOSED } m_state;
 
-  ulong m_thd_options;  ///< For saving thd->options.
+  ulonglong m_thd_options;  ///< For saving thd->options.
   /**
     If backup/restore was interrupted by an error, this member stores the error 
     number.
diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc	2008-03-05 18:48:05 +01:00
+++ b/sql/backup/kernel.cc	2008-03-06 12:20:45 +01:00
@@ -399,7 +399,7 @@ int Backup_restore_ctx::prepare(LEX_STRI
    */ 
 #if defined(__WIN__) || defined(__EMX__)  
 
-  bad_filename ||= check_if_legal_filename(location.str);
+  bad_filename = bad_filename || check_if_legal_filename(location.str);
   
 #endif
 
@@ -1227,8 +1227,8 @@ bcat_iterator_next(st_bstream_image_head
   if (iter == &cset_iter)
   {
     switch (cset_iter) {
-      case 0: name.begin= (byte*)my_charset_utf8_bin.csname; break;
-      case 1: name.begin= (byte*)system_charset_info->csname; break;
+      case 0: name.begin= (backup::byte*)my_charset_utf8_bin.csname; break;
+      case 1: name.begin= (backup::byte*)system_charset_info->csname; break;
       default: name.begin= NULL; break;
     }
 
diff -Nrup a/sql/backup/logger.h b/sql/backup/logger.h
--- a/sql/backup/logger.h	2008-03-05 18:48:05 +01:00
+++ b/sql/backup/logger.h	2008-03-06 12:20:45 +01:00
@@ -76,7 +76,7 @@ class Logger
     operation. Value of @c m_op_id is meaningful only after a successful 
     call to @c init(), when @m_state != CREATED.
    */ 
-  ulong m_op_id;
+  ulonglong m_op_id;
 
   int v_report_error(log_level::value, int, va_list);
   int v_write_message(log_level::value, int, const char*, va_list);