Commit 5f5c3673 authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Fixed bug in allocation memory in key cache. (Memory was not properly aligned...

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_
parent 03fbbb7a
...@@ -219,9 +219,9 @@ extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); ...@@ -219,9 +219,9 @@ extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
/* statistics */ /* statistics */
extern ulong _my_cache_w_requests,_my_cache_write,_my_cache_r_requests, extern ulong my_cache_w_requests, my_cache_write, my_cache_r_requests,
_my_cache_read; my_cache_read;
extern ulong _my_blocks_used,_my_blocks_changed; extern ulong my_blocks_used, my_blocks_changed;
extern uint key_cache_block_size; extern uint key_cache_block_size;
extern ulong my_file_opened,my_stream_opened, my_tmp_file_created; extern ulong my_file_opened,my_stream_opened, my_tmp_file_created;
extern my_bool key_cache_inited, my_init_done; extern my_bool key_cache_inited, my_init_done;
......
...@@ -646,13 +646,13 @@ int main(int argc, char *argv[]) ...@@ -646,13 +646,13 @@ int main(int argc, char *argv[])
(long) range_records > (long) records*14/10+2) (long) range_records > (long) records*14/10+2)
{ {
printf("mi_records_range for key: %d returned %ld; Should be about %ld\n", 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; goto end;
} }
if (verbose && records) if (verbose && records)
{ {
printf("mi_records_range returned %ld; Exact is %ld (diff: %4.2g %%)\n", 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); labs((long) range_records-(long) records)*100.0/records);
} }
...@@ -667,7 +667,7 @@ int main(int argc, char *argv[]) ...@@ -667,7 +667,7 @@ int main(int argc, char *argv[])
{ {
puts("Wrong info from mi_info"); puts("Wrong info from mi_info");
printf("Got: records: %ld delete: %ld i_keys: %d\n", 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) if (verbose)
{ {
...@@ -822,8 +822,8 @@ w_requests: %10lu\n\ ...@@ -822,8 +822,8 @@ w_requests: %10lu\n\
writes: %10lu\n\ writes: %10lu\n\
r_requests: %10lu\n\ r_requests: %10lu\n\
reads: %10lu\n", reads: %10lu\n",
_my_blocks_used,_my_cache_w_requests, _my_cache_write, my_blocks_used, my_cache_w_requests, my_cache_write,
_my_cache_r_requests,_my_cache_read); my_cache_r_requests, my_cache_read);
} }
end_key_cache(); end_key_cache();
if (blob_buffer) if (blob_buffer)
......
...@@ -272,7 +272,7 @@ int run_test(const char *filename) ...@@ -272,7 +272,7 @@ int run_test(const char *filename)
create_key(key, nrecords*upd); create_key(key, nrecords*upd);
print_key(key," INTERSECT\n"); print_key(key," INTERSECT\n");
hrows=mi_records_in_range(file,0,key,0,HA_READ_MBR_INTERSECT,record+1,0,0); 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; if (mi_close(file)) goto err;
......
This diff is collapsed.
...@@ -4415,13 +4415,13 @@ struct show_var_st status_vars[]= { ...@@ -4415,13 +4415,13 @@ struct show_var_st status_vars[]= {
{"Handler_rollback", (char*) &ha_rollback_count, SHOW_LONG}, {"Handler_rollback", (char*) &ha_rollback_count, SHOW_LONG},
{"Handler_update", (char*) &ha_update_count, SHOW_LONG}, {"Handler_update", (char*) &ha_update_count, SHOW_LONG},
{"Handler_write", (char*) &ha_write_count, SHOW_LONG}, {"Handler_write", (char*) &ha_write_count, SHOW_LONG},
{"Key_blocks_used", (char*) &_my_blocks_used, SHOW_LONG_CONST}, {"Key_blocks_used", (char*) &my_blocks_used, SHOW_LONG_CONST},
{"Key_read_requests", (char*) &_my_cache_r_requests, SHOW_LONG}, {"Key_read_requests", (char*) &my_cache_r_requests, SHOW_LONG},
{"Key_reads", (char*) &_my_cache_read, SHOW_LONG}, {"Key_reads", (char*) &my_cache_read, SHOW_LONG},
{"Key_write_requests", (char*) &_my_cache_w_requests, SHOW_LONG}, {"Key_write_requests", (char*) &my_cache_w_requests, SHOW_LONG},
{"Key_writes", (char*) &_my_cache_write, SHOW_LONG}, {"Key_writes", (char*) &my_cache_write, SHOW_LONG},
{"Max_used_connections", (char*) &max_used_connections, SHOW_LONG}, {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG},
{"Not_flushed_key_blocks", (char*) &_my_blocks_changed, SHOW_LONG_CONST}, {"Not_flushed_key_blocks", (char*) &my_blocks_changed, SHOW_LONG_CONST},
{"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_CONST}, {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_CONST},
{"Open_tables", (char*) 0, SHOW_OPENTABLES}, {"Open_tables", (char*) 0, SHOW_OPENTABLES},
{"Open_files", (char*) &my_file_opened, SHOW_LONG_CONST}, {"Open_files", (char*) &my_file_opened, SHOW_LONG_CONST},
......
...@@ -321,8 +321,8 @@ w_requests: %10lu\n\ ...@@ -321,8 +321,8 @@ w_requests: %10lu\n\
writes: %10lu\n\ writes: %10lu\n\
r_requests: %10lu\n\ r_requests: %10lu\n\
reads: %10lu\n", reads: %10lu\n",
_my_blocks_used,_my_blocks_changed,_my_cache_w_requests, my_blocks_used,my_blocks_changed,my_cache_w_requests,
_my_cache_write,_my_cache_r_requests,_my_cache_read); my_cache_write,my_cache_r_requests,my_cache_read);
pthread_mutex_unlock(&THR_LOCK_keycache); pthread_mutex_unlock(&THR_LOCK_keycache);
if (thd) if (thd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment