summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-06-27 18:02:28 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-06-27 18:02:28 +0400
commit09d902d84befaf3b1d247c2fcb9706e3f83522f4 (patch)
tree4d27adfcf0fd51a2cd666de7207e4561006beb6b /storage/innobase
parent652e799a387f63a582254a68363e720e47db97e4 (diff)
downloadmariadb-git-09d902d84befaf3b1d247c2fcb9706e3f83522f4.tar.gz
MDEV-9618 solaris sparc build fails on 10.1.
Compiler on Sparc is strict about the 'const' modifiers in function declarations and definitions. Meaning they should be exactly same.
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/include/ha_prototypes.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 427bfaf2c05..1177a8fd3cf 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -289,8 +289,10 @@ innobase_casedn_str(
#ifdef WITH_WSREP
UNIV_INTERN
int
-wsrep_innobase_kill_one_trx(void *thd_ptr,
- const trx_t *bf_trx, trx_t *victim_trx, ibool signal);
+wsrep_innobase_kill_one_trx(void * const thd_ptr,
+ const trx_t * const bf_trx,
+ trx_t *victim_trx,
+ ibool signal);
int wsrep_innobase_mysql_sort(int mysql_type, uint charset_number,
unsigned char* str, unsigned int str_length,
unsigned int buf_length);