summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-07-11 13:09:39 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-07-11 13:09:39 +0300
commit6a1fda7aba66cb75170397ec67a3e807151f3b27 (patch)
tree4b20a2874a5298c62cb895c6f93be5c667be7f3c /storage
parentecbd9efeb07e459f7b82421171f62c2365082cb5 (diff)
downloadmariadb-git-6a1fda7aba66cb75170397ec67a3e807151f3b27.tar.gz
porting 29070 to 5.1-opt
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/sp_key.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/sp_key.c b/storage/myisam/sp_key.c
index 21965fad6b3..3748a38ff81 100644
--- a/storage/myisam/sp_key.c
+++ b/storage/myisam/sp_key.c
@@ -78,7 +78,7 @@ uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key,
if (keyseg->flag & HA_SWAP_KEY)
{
- char buf[sizeof(double)];
+ uchar buf[sizeof(double)];
float8store(buf, val);
pos= &buf[length];
@@ -87,7 +87,7 @@ uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key,
}
else
{
- float8store((byte *)key, val);
+ float8store((uchar *)key, val);
key += length;
}
len+= length;
@@ -128,7 +128,7 @@ static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims,
{
if ((*wkb) > end - 8)
return -1;
- float8get(ord, (const byte*) *wkb);
+ float8get(ord, (const uchar*) *wkb);
(*wkb)+= 8;
if (ord < *mbr)
*mbr= ord;