#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedg543bms81hhz
3265 Marko Mäkelä 2010-10-20 [merge]
Merge from mysql-5.5-innodb to mysql-trunk-innodb
modified:
storage/innobase/include/data0type.h
=== 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 commit into mysql-trunk-innodb branch (marko.makela:3265) | marko.makela | 20 Oct |
