bzr commit into mysql-6.0 branch (vvaintroub:3063) Bug#43120 Bug#43131

[Vladislav Vaintroub]

#At file:///G:/bzr/mysql-6.0-alik/ based on revid:jperkin@stripped

 3063 Vladislav Vaintroub	2009-02-24
      Bug #43131 Maria compile error 6.0-main
      Bug #43120 Backup tree does not compile on Windows Vista w/VS 2008 Pro 
      
      Use patches by Rafal and Sergei to fix compile problems on Windows debug

    modified:
      sql/backup/backup_info.cc
      storage/maria/ma_non_trans_log.c
=== modified file 'sql/backup/backup_info.cc'
--- a/sql/backup/backup_info.cc	2009-02-13 12:40:13 +0000
+++ b/sql/backup/backup_info.cc	2009-02-24 09:50:47 +0000
@@ -171,16 +171,15 @@ Backup_info::find_backup_engine(const ba
 
 #ifndef DBUG_OFF
   backup_factory *saved_factory; // to save hton->get_backup_engine
+#ifndef WITH_MARIA_STORAGE_ENGINE
+  handlerton *maria_hton= (handlerton*) 1;  
+#endif
 
   DBUG_EXECUTE_IF("backup_test_dummy_be_factory", 
     {
       handlerton *hton= se_hton(se);
       saved_factory= hton->get_backup_engine;
-      if (hton == myisam_hton
-#ifdef WITH_MARIA_STORAGE_ENGINE
-          || hton == maria_hton
-#endif
-          ) 
+      if (hton == myisam_hton || hton == maria_hton) 
         hton->get_backup_engine= dummy_backup_engine_factory;
     });
 #endif

=== modified file 'storage/maria/ma_non_trans_log.c'
--- a/storage/maria/ma_non_trans_log.c	2009-02-13 12:40:13 +0000
+++ b/storage/maria/ma_non_trans_log.c	2009-02-24 09:50:47 +0000
@@ -244,10 +244,9 @@ void _maria_log_command(IO_CACHE *log, e
                          const uchar *buffert, uint length, int result)
 {
   uchar header[14];
-  int old_errno, headerlen;
   ulong pid=(ulong) GETPID();
   File file= share->kfile.file;
-  old_errno=my_errno;
+  int old_errno=my_errno, headerlen;
   DBUG_ENTER("_maria_log_command");
   DBUG_PRINT("enter", ("command: %u share->open_file_name.str '%s'",
                        command, share->open_file_name.str));


Attachment: [text/bzr-bundle] bzr/[e-mail]