summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <bell@oleksandr-byelkins-powerbook-g4-15.local>2008-02-08 08:45:41 +0200
committerunknown <bell@oleksandr-byelkins-powerbook-g4-15.local>2008-02-08 08:45:41 +0200
commit0a0c6041f7fe9f150c2d9c51a2bfcbf1cdaffdaf (patch)
treef7107375abc268fdf59ed289c3247d9ef95983b0
parentb03e603585be6029565c287959c527d626aa90eb (diff)
downloadmariadb-git-0a0c6041f7fe9f150c2d9c51a2bfcbf1cdaffdaf.tar.gz
Postmerge mac compiler warnings fixed.
-rw-r--r--storage/maria/unittest/ma_control_file-t.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/unittest/ma_control_file-t.c b/storage/maria/unittest/ma_control_file-t.c
index 65651a89149..fa996fdc58b 100644
--- a/storage/maria/unittest/ma_control_file-t.c
+++ b/storage/maria/unittest/ma_control_file-t.c
@@ -347,7 +347,7 @@ static int test_2_open_and_2_close()
static int test_bad_magic_string()
{
- char buffer[4];
+ uchar buffer[4];
int fd;
RET_ERR_UNLESS(create_or_open_file() == CONTROL_FILE_OK);
@@ -358,7 +358,8 @@ static int test_bad_magic_string()
O_BINARY | O_RDWR,
MYF(MY_WME))) >= 0);
RET_ERR_UNLESS(my_pread(fd, buffer, 4, 0, MYF(MY_FNABP | MY_WME)) == 0);
- RET_ERR_UNLESS(my_pwrite(fd, "papa", 4, 0, MYF(MY_FNABP | MY_WME)) == 0);
+ RET_ERR_UNLESS(my_pwrite(fd, (const uchar *)"papa", 4, 0,
+ MYF(MY_FNABP | MY_WME)) == 0);
/* Check that control file module sees the problem */
RET_ERR_UNLESS(local_ma_control_file_create_or_open(TRUE) ==