summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-12-15 11:59:37 +0400
committerAlexander Barkov <bar@mariadb.org>2015-12-15 11:59:37 +0400
commite9b4a041af5122dffd59012493c565e6e3db2664 (patch)
tree880f38179d0548a21aaeb0b3528b6533e7245b7b /storage
parentb63bf7368b4881789bef931f90d4719b358cf507 (diff)
downloadmariadb-git-e9b4a041af5122dffd59012493c565e6e3db2664.tar.gz
MDEV-8721 AIX: Compile error xtradb:log0log.cc
Diffstat (limited to 'storage')
-rw-r--r--storage/xtradb/log/log0log.cc2
-rw-r--r--storage/xtradb/log/log0recv.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc
index 5a05070a535..327bbc2f93b 100644
--- a/storage/xtradb/log/log0log.cc
+++ b/storage/xtradb/log/log0log.cc
@@ -256,7 +256,7 @@ log_buffer_extend(
{
ulint move_start;
ulint move_end;
- byte* tmp_buf = static_cast<byte *>(alloca(OS_FILE_LOG_BLOCK_SIZE));
+ byte* tmp_buf = reinterpret_cast<byte *>(alloca(OS_FILE_LOG_BLOCK_SIZE));
mutex_enter(&(log_sys->mutex));
diff --git a/storage/xtradb/log/log0recv.cc b/storage/xtradb/log/log0recv.cc
index 221a667437b..7d12c2fb678 100644
--- a/storage/xtradb/log/log0recv.cc
+++ b/storage/xtradb/log/log0recv.cc
@@ -3097,7 +3097,7 @@ recv_recovery_from_checkpoint_start_func(
#endif /* UNIV_LOG_ARCHIVE */
byte* buf;
byte* log_hdr_buf;
- byte* log_hdr_buf_base = static_cast<byte *>
+ byte* log_hdr_buf_base = reinterpret_cast<byte *>
(alloca(LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE));
dberr_t err;
ut_when_dtor<recv_dblwr_t> tmp(recv_sys->dblwr);