summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-03-25 02:37:41 +0200
committermonty@narttu.mysql.fi <>2003-03-25 02:37:41 +0200
commit5f5c367361cc213601c609dbd9bec98487a48de0 (patch)
tree6b0e070b3d93ce9b3d3f7d622757752b48914aab /myisam
parent03fbbb7aef3724286996d0cec96f321b58a90211 (diff)
downloadmariadb-git-5f5c367361cc213601c609dbd9bec98487a48de0.tar.gz
Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)
Changed keycache variables to start with my_ instead of _my_
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_test2.c10
-rw-r--r--myisam/sp_test.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c
index b5da87355c6..8c7713c4b4d 100644
--- a/myisam/mi_test2.c
+++ b/myisam/mi_test2.c
@@ -646,13 +646,13 @@ int main(int argc, char *argv[])
(long) range_records > (long) records*14/10+2)
{
printf("mi_records_range for key: %d returned %ld; Should be about %ld\n",
- i, range_records, records);
+ i, (long) range_records, (long) records);
goto end;
}
if (verbose && records)
{
printf("mi_records_range returned %ld; Exact is %ld (diff: %4.2g %%)\n",
- range_records,records,
+ (long) range_records, (long) records,
labs((long) range_records-(long) records)*100.0/records);
}
@@ -667,7 +667,7 @@ int main(int argc, char *argv[])
{
puts("Wrong info from mi_info");
printf("Got: records: %ld delete: %ld i_keys: %d\n",
- info.records,info.deleted,info.keys);
+ (long) info.records, (long) info.deleted,info.keys);
}
if (verbose)
{
@@ -822,8 +822,8 @@ w_requests: %10lu\n\
writes: %10lu\n\
r_requests: %10lu\n\
reads: %10lu\n",
- _my_blocks_used,_my_cache_w_requests, _my_cache_write,
- _my_cache_r_requests,_my_cache_read);
+ my_blocks_used, my_cache_w_requests, my_cache_write,
+ my_cache_r_requests, my_cache_read);
}
end_key_cache();
if (blob_buffer)
diff --git a/myisam/sp_test.c b/myisam/sp_test.c
index 7ae41c2088c..7021cb4a8ee 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.c
@@ -272,7 +272,7 @@ int run_test(const char *filename)
create_key(key, nrecords*upd);
print_key(key," INTERSECT\n");
hrows=mi_records_in_range(file,0,key,0,HA_READ_MBR_INTERSECT,record+1,0,0);
- printf(" %ld rows\n",hrows);
+ printf(" %ld rows\n", (long) hrows);
if (mi_close(file)) goto err;