List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 20 2010 1:00pm
Subject:bzr push into mysql-trunk-innodb branch (marko.makela:3264 to 3265)
View as plain text  
 3265 Marko Mäkelä	2010-10-20 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb

    modified:
      storage/innobase/include/data0type.h
 3264 Marko Mäkelä	2010-10-20 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb

    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:marko.makela@stripped
+++ b/storage/innobase/include/data0type.h	revid:marko.makela@oracle.com-20101020125959-i10zgevdps2yra23
@@ -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/marko.makela@oracle.com-20101020125959-i10zgevdps2yra23.bundle
Thread
bzr push into mysql-trunk-innodb branch (marko.makela:3264 to 3265) marko.makela20 Oct