bzr commit into mysql-5.1-innodb branch (marko.makela:3683) Bug#59181

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ based on revid:vasil.dimov@strippedcbafzqux5gy

 3683 Marko Mäkelä	2011-01-10
      Bug#59181 InnoDB compilation failure on the Sun Studio compiler
      
      Define UNIV_PREFETCH_R(add) as sun_prefetch_read_many((void*) addr),
      because apparently some versions of the Sun library
      omit the const qualifier.

    modified:
      storage/innodb_plugin/include/univ.i
=== modified file 'storage/innodb_plugin/include/univ.i'
--- a/storage/innodb_plugin/include/univ.i	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/include/univ.i	revid:[e-mail]-20110110133445-wq8vjvm9ag8qsog9
@@ -412,7 +412,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]