bzr commit into mysql-6.0-backup branch (Rafal.Somla:2872) Bug#46880

[Rafal Somla]

#At file:///ext/mysql/bzr/backup/bug46880/ based on revid:hema@stripped

 2872 Rafal Somla	2009-09-23
      BUG#46880 - Many compile warnings are reported for BACKUP in PB2
      
      A follow-up patch which fixes two additional warnings reported in PB2.
     @ sql/backup/backup_aux.h
        - Add custom operator delete corresponding to custom operator new.
        - Add missing cast to ulong.

    modified:
      sql/backup/backup_aux.h
=== modified file 'sql/backup/backup_aux.h'
--- a/sql/backup/backup_aux.h	2009-09-21 11:39:02 +0000
+++ b/sql/backup/backup_aux.h	2009-09-23 06:01:48 +0000
@@ -331,6 +331,9 @@ struct Map<A,B>::Node
     DBUG_ASSERT(map);
     return alloc_root(&(map->mem_root), size);
   }
+
+  static void operator delete(void *ptr, Map<A,B> *map)
+  { /* never called */ }
 };
 
 
@@ -349,7 +352,7 @@ Map<A,B>::Map(size_t init_size)
   
   DBUG_ASSERT(init_size <= (size_t)(ulong)(~(ulong)0));
   
-  my_hash_init(&m_hash, &::my_charset_bin, init_size,
+  my_hash_init(&m_hash, &::my_charset_bin, (ulong)init_size,
                0, sizeof(A), NULL, NULL, MYF(0));
 }
 


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