mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Manual merge after improving concurrency for key cache reassignment
include/myisam.h: Auto merged isam/isamchk.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_locking.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamlog.c: Auto merged mysql-test/r/func_group.result: Auto merged mysys/mf_keycache.c: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisam.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_yacc.yy: Auto merged
This commit is contained in:
@ -319,8 +319,9 @@ 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);
|
||||
dflt_key_cache_var.blocks_used,dflt_key_cache_var.blocks_changed,
|
||||
dflt_key_cache_var.cache_w_requests,dflt_key_cache_var.cache_write,
|
||||
dflt_key_cache_var.cache_r_requests,dflt_key_cache_var.cache_read);
|
||||
pthread_mutex_unlock(&THR_LOCK_keycache);
|
||||
|
||||
if (thd)
|
||||
|
Reference in New Issue
Block a user