From: Vladislav Vaintroub
Date: February 24 2009 9:50am
Subject: bzr commit into mysql-6.0 branch (vvaintroub:3063) Bug#43120 Bug#43131
List-Archive: http://lists.mysql.com/commits/67328
X-Bug: 43120,43131
Message-Id: <0KFK00I4NE1DGU30@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_teomp8S7FRQoYgbESu/TNQ)"

--Boundary_(ID_teomp8S7FRQoYgbESu/TNQ)
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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));


--Boundary_(ID_teomp8S7FRQoYgbESu/TNQ)
MIME-version: 1.0
Content-type: text/bzr-bundle;
 name="bzr/vvaintroub@stripped";
 charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/vvaintroub@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vvaintroub@stripped
# target_branch: file:///G:/bzr/mysql-6.0-alik/
# testament_sha1: 56e83e50939c0ce146771ccc3fc87d8f69e4403e
# timestamp: 2009-02-24 10:51:00 +0100
# base_revision_id: jperkin@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdgYzQcAAlJfgFAQWXf//3Lj
34C////0UAVvS6XsDbj3gatbrrVglEKYmJJ7IantTU9MqeE0jyj0nlGjT01HlD0yQSUSajHlTyme
qeaU8UyaBkANNANAAAkoNRR/qk9NTZQeoyAAAAyAAABIpIzSJpk09MkBtTQ0aMQAAAACUQJoA0Jp
PJqHpMFRgQPSGnqAB6jsd2rPg7vq6ppw8je95nWKSJGoqX17K6F4OuCZFAcZJVocrDxqupYSWZJH
nyxvlmnyMRVUVQb80P4dDC9pgLNi2wuoVI6oOUEcDFvCsp6b+f+xRFjWcMXR37CO3+VFur2vtdYL
EscsjKHDRSZQH85p8dVmfTW92UsfZBnGWMbSgMc9oiZnQ/tgRl8FbtSa2BFBLq80xAw39R/9bEE6
FJhuKWuWBVK1QAtX62NEG2tgcpEaMFqV1N1DRnWyElEDgbEJ1MBqCOJsiaoB8SggkRURJxCccMSj
1GhAoPKpK0ShVZEq3tKxQ5KQLbWElHVDncrxmX1DAMTV5TVkDcrodPNnV8qMSMbTxSeE4IB6CZCu
lZ+E2EZdAgohUYIMpKrpEqGiuJ3GJtOY+Qt5ceEyWmh7x5C+55KRkUDW0ECCtF1nKByLiw9eY2k3
DxQPE58Ut3SqMp1YXCgNRx0G2HmW/i4OEzFQN/A73IwsAsTllNPHSRWU+0XMC2KNJmRTDuGjZHM0
HGc5l5PgBcd/lzxuuO4UwLh6dByWyqwCRe81JHv2TCeQuSgVorjcUF6jzzWFhPeNLgkOM9jI7Ert
z98rXjS0drrDxF0JhZS3xi0lQkroyIJyZF3kItcoLDKGLCIEcuBelLd4aYWJVUiXJHZMuYwtLpZL
oK6VPOM35ChtEIpkNT/NKszYmESsa/vFAuJ/ePHBEqiqLe82YuTOvLk7nK7rBHLJC3nGzrCyHje7
XGJUk9Y/J9T9w+mwUYWoxCtFuI5u+C6qOTaxcprNxCJsNKSmw0GrYSE6e3iYdsQTA4jzjzNE5Ra2
/pQZzR2wu2q2/u2Jqx0gdE4mwj4wLS4agYnt7YHEzMfsssmfg72IHH0UU7GaBxMCc6kEvOhjHvx7
+5qoLERJBP5RqqJTmYo8DkKDgXqVAb6Sp8TcMyRv4DR6m4jgBEz33vDRUrvHjCtVvGnWtfFPkU25
qVI4Tscys8LS/mxrJoET0cdUUSFtfx3aI/oaNKRSrPUtySixAsLENh8xvNk1Nx7NTM3D9h56HelK
fmcjMOTsOIOSJ+XPE6ihwRRl8B93fe5xmYq0UrkEm9WwtzDdYDbmhKRPflwkqZsImHhOBMbf4qfR
4X9uIoqFhE1w9wHzMbEdugIcnu0QN1aBPtyvmhMDiyE8bSi26sxs7tKeBalKF/H4RoUSLdBYNUG0
NxZvqcRrz0Eg828C3i6steF4lAhwDq+5kr8fvOkKQ5ZzWBbWe6wCK1GpQTd+PjNWnHoiF+NVArRb
lDAciokyfHkBaXgQQ6RcNIqDNO40SmL0hFBUhiqIJ0lmNGeRbShYMda0qxBFQLcE20pluxR/IrxK
UqYkKC+AhUbzehqTgOMnpam23iDa9pkwKYGq/oAaPkAfee8ZkjsDipYUKqOeWywgyQTtA1gBb7pE
lRs7wWChOnA9cqYMBzRCCJBRU+2DeGxBj2FCgxZv7FM1cVlAzPEJMan4jAzbBb1suTk7akHh2RmW
EoMKz4WwIHvB41lWgQjvGngrOgNzitKlWYJHIyVivwMhMrQiHebmAvmSZVIdGUmQTKEKUE33aWgw
uFGOlmKAx9JLl4leRHZtZINdIzMStVbATI308yXJ3WVH5D/F3JFOFCQ2BjNBwA==


--Boundary_(ID_teomp8S7FRQoYgbESu/TNQ)--