revision-id: 79f9820f0309b141e27d0841298d63349743b744 (mariadb-10.3.6-216-g79f9820f030) parent(s): 067c444615c1e82a8d06fad0a528b97426436b87 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 14:56:46 +0200 message: Revert unnecessary change on ha_prototypes.h --- storage/innobase/include/ha_prototypes.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h index 5fc1d3cc90e..15107a93807 100644 --- a/storage/innobase/include/ha_prototypes.h +++ b/storage/innobase/include/ha_prototypes.h @@ -236,11 +236,13 @@ 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); ulint wsrep_innobase_mysql_sort(int mysql_type, uint charset_number, - unsigned char* str, unsigned int str_length, - unsigned int buf_length); + unsigned char* str, unsigned int str_length, + unsigned int buf_length); #endif /* WITH_WSREP */ /**********************************************************************//**