diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-01 20:16:36 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-01 20:16:36 -0700 |
| commit | 7c7ee4d2f4ae29df2167b0ca0e9ab6dfd93a1c07 (patch) | |
| tree | e1116ef7faa18e25e4ea484099e4c14d6fbbf7f1 /sql/sql_test.cc | |
| parent | cce14aabfc09628b246b3bc6ba40e6d83308da4f (diff) | |
| parent | 7de7c38f2f1b678e6d1894b94dd9abe9de9d8c70 (diff) | |
| download | mariadb-git-7c7ee4d2f4ae29df2167b0ca0e9ab6dfd93a1c07.tar.gz | |
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
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index f991a09398b..eb1fb48909a 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -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) |