diff options
| author | unknown <serg@serg.mylan> | 2003-10-31 10:34:34 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-31 10:34:34 +0100 |
| commit | 70701c641f2000805fcdbb820036ff1ca3ae4d87 (patch) | |
| tree | e3649ecfe44ca927dd7369b8cd2116bb28646ad0 /sql/sql_test.cc | |
| parent | 40c2ce10a7cd034b20d475f0998c4956ae0e179c (diff) | |
| parent | 3897d2de2f4ce72a4383c00099932963f1ce8c2e (diff) | |
| download | mariadb-git-70701c641f2000805fcdbb820036ff1ca3ae4d87.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
myisam/mi_check.c:
Auto merged
myisam/mi_delete.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/range.result:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
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 d8d6d716abe..7e3513367fd 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -323,8 +323,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) |