summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-01-10 15:34:45 +0200
committerMarko Mäkelä <marko.makela@oracle.com>2011-01-10 15:34:45 +0200
commit7fb17e42cf2f6f309f43907f2db84389d8d895e8 (patch)
treec9e5d893db918d94f02b5c7ffe2c7968d3549dae /storage
parent2815ffeeb9a62c04359c49e21a8b5653bde996f1 (diff)
downloadmariadb-git-7fb17e42cf2f6f309f43907f2db84389d8d895e8.tar.gz
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.
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/include/univ.i2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innodb_plugin/include/univ.i b/storage/innodb_plugin/include/univ.i
index bbff8ddf1e3..4425950748b 100644
--- a/storage/innodb_plugin/include/univ.i
+++ b/storage/innodb_plugin/include/univ.i
@@ -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 */