summaryrefslogtreecommitdiff
path: root/storage/maria/ma_test3.c
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
committerunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
commit631ecaabea7336a8f28367c0d1c291f0433f7e88 (patch)
tree2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /storage/maria/ma_test3.c
parentcfdd73369c0c2d57908af8dc727de33567fe9e0b (diff)
downloadmariadb-git-631ecaabea7336a8f28367c0d1c291f0433f7e88.tar.gz
Merged with mysql-5.1 main tree.
BUILD/compile-pentium-debug-max: Added definition after macro was removed from main tree. This will be fixed back in main tree later.
Diffstat (limited to 'storage/maria/ma_test3.c')
-rw-r--r--storage/maria/ma_test3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_test3.c b/storage/maria/ma_test3.c
index dcc0ac2e013..948ba09aa24 100644
--- a/storage/maria/ma_test3.c
+++ b/storage/maria/ma_test3.c
@@ -242,7 +242,7 @@ int test_read(MARIA_HA *file,int id)
for (i=0 ; i < 100 ; i++)
{
find=rnd(100000);
- if (!maria_rkey(file,record.id,1,(byte*) &find,
+ if (!maria_rkey(file,record.id,1,(uchar*) &find,
sizeof(find),HA_READ_KEY_EXACT))
found++;
else
@@ -425,7 +425,7 @@ int test_update(MARIA_HA *file,int id,int lock_type)
{
tmp=rnd(100000);
int4store(find,tmp);
- if (!maria_rkey(file,record.id,1,(byte*) find,
+ if (!maria_rkey(file,record.id,1,(uchar*) find,
sizeof(find),HA_READ_KEY_EXACT))
found++;
else