summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-03-25 02:37:41 +0200
committerunknown <monty@narttu.mysql.fi>2003-03-25 02:37:41 +0200
commit11841c05ec1b2db812e9827e9206551e42d9e87d (patch)
tree6b0e070b3d93ce9b3d3f7d622757752b48914aab /sql
parentf33c97281a9861467553bbaaa28a0b205dfcd291 (diff)
downloadmariadb-git-11841c05ec1b2db812e9827e9206551e42d9e87d.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_ include/my_sys.h: Changed keycache variables to start with my_ instead of _my_ myisam/mi_test2.c: Changed keycache variables to start with my_ instead of _my_ Removed compiler warnings myisam/sp_test.c: Removed compiler warning mysys/mf_keycache.c: Fixed bug in allocation memory (Memory was not properly aligned which cased core dumps on sparc CPU's) Changed keycache variables to start with my_ instead of _my_ Fixed indentation and comment syntax. Removed end space. sql/mysqld.cc: Changed keycache variables to start with my_ instead of _my_ sql/sql_test.cc: Changed keycache variables to start with my_ instead of _my_
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc14
-rw-r--r--sql/sql_test.cc4
2 files changed, 9 insertions, 9 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ddaf8e538c6..ac3703c5a1d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4415,13 +4415,13 @@ struct show_var_st status_vars[]= {
{"Handler_rollback", (char*) &ha_rollback_count, SHOW_LONG},
{"Handler_update", (char*) &ha_update_count, SHOW_LONG},
{"Handler_write", (char*) &ha_write_count, SHOW_LONG},
- {"Key_blocks_used", (char*) &_my_blocks_used, SHOW_LONG_CONST},
- {"Key_read_requests", (char*) &_my_cache_r_requests, SHOW_LONG},
- {"Key_reads", (char*) &_my_cache_read, SHOW_LONG},
- {"Key_write_requests", (char*) &_my_cache_w_requests, SHOW_LONG},
- {"Key_writes", (char*) &_my_cache_write, SHOW_LONG},
- {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG},
- {"Not_flushed_key_blocks", (char*) &_my_blocks_changed, SHOW_LONG_CONST},
+ {"Key_blocks_used", (char*) &my_blocks_used, SHOW_LONG_CONST},
+ {"Key_read_requests", (char*) &my_cache_r_requests, SHOW_LONG},
+ {"Key_reads", (char*) &my_cache_read, SHOW_LONG},
+ {"Key_write_requests", (char*) &my_cache_w_requests, SHOW_LONG},
+ {"Key_writes", (char*) &my_cache_write, SHOW_LONG},
+ {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG},
+ {"Not_flushed_key_blocks", (char*) &my_blocks_changed, SHOW_LONG_CONST},
{"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_CONST},
{"Open_tables", (char*) 0, SHOW_OPENTABLES},
{"Open_files", (char*) &my_file_opened, SHOW_LONG_CONST},
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index 88ed86732f1..d2f97640010 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -321,8 +321,8 @@ w_requests: %10lu\n\
writes: %10lu\n\
r_requests: %10lu\n\
reads: %10lu\n",
- _my_blocks_used,_my_blocks_changed,_my_cache_w_requests,
- _my_cache_write,_my_cache_r_requests,_my_cache_read);
+ my_blocks_used,my_blocks_changed,my_cache_w_requests,
+ my_cache_write,my_cache_r_requests,my_cache_read);
pthread_mutex_unlock(&THR_LOCK_keycache);
if (thd)