bzr push into mysql-5.5-innodb branch (marko.makela:3281 to 3282)

[marko.makela]

 3282 Marko Mäkelä	2011-01-10 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/include/univ.i
 3281 Vasil Dimov	2011-01-08 [merge]
      Null merge mysql-5.1-innodb -> mysql-5.5-innodb
      (irrelevant for 5.5 and up)

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:vasil.dimov@stripped236-ffp48jfkfiq0n46r
+++ b/storage/innobase/include/univ.i	revid:marko.makela@stripped9uzct8
@@ -429,7 +429,7 @@ it is read or written. */
 /* Use sun_prefetch when compile with Sun Studio */
 # define UNIV_EXPECT(expr,value) (expr)
 # define UNIV_LIKELY_NULL(expr) (expr)
-# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many(addr)
+# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many((void*) addr)
 # define UNIV_PREFETCH_RW(addr) sun_prefetch_write_many(addr)
 #else
 /* Dummy versions of the macros */

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