bzr push into mysql-5.5-innodb branch (marko.makela:3191 to 3192) Bug#57588

[marko.makela]

 3192 Marko Mäkelä	2010-10-20
      Fix a compiler warning caused by fixing Bug #57588 (compiler warning).
      
      Declare DATA_MBMAXLEN with the same data type as DATA_MBMINLEN.

    modified:
      storage/innobase/include/data0type.h
 3191 Marko Mäkelä	2010-10-20
      Fix bit-rot left by the multiple buffer pools patch.
      
      Rename buf_pool_watch, buf_pool_mutex, buf_pool_zip_mutex
      to buf_pool->watch, buf_pool->mutex, buf_pool->zip_mutex
      in comments. Refer to buf_pool->flush_list_mutex instead of
      flush_list_mutex.
      
      Remove obsolete declarations of buf_pool_mutex and buf_pool_zip_mutex.

    modified:
      storage/innobase/buf/buf0buddy.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/include/buf0buddy.h
      storage/innobase/include/buf0buddy.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0flu.h
      storage/innobase/sync/sync0sync.c
=== modified file 'storage/innobase/include/data0type.h'
--- a/storage/innobase/include/data0type.h	revid:[e-mail]-20101020114628-ly1tyc8etgxr985x
+++ b/storage/innobase/include/data0type.h	revid:marko.makela@stripped101020125847-g0flbamnsu8jzoc1
@@ -180,7 +180,7 @@ because in GCC it returns a long. */
                                     UNIV_EXPECT(((mbminmaxlen) % DATA_MBMAX), \
                                                 1))
 /* Get mbmaxlen from mbminmaxlen. */
-#define DATA_MBMAXLEN(mbminmaxlen) ((mbminmaxlen) / DATA_MBMAX)
+#define DATA_MBMAXLEN(mbminmaxlen) ((ulint) ((mbminmaxlen) / DATA_MBMAX))
 
 #ifndef UNIV_HOTBACKUP
 /*********************************************************************//**

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