diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-30 09:53:04 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-30 09:53:04 -0700 |
| commit | dabe472203efe96b8688998ff1685492ed57261b (patch) | |
| tree | bc0fbb84e9c732cd6a72e75870455d59f00c5850 /myisam/myisamchk.c | |
| parent | 0a1d7d64c85894fda6ff1f6342b167d22110dbf7 (diff) | |
| parent | 42817571dcb59e16f27cdf28843f26e45da893ee (diff) | |
| download | mariadb-git-dabe472203efe96b8688998ff1685492ed57261b.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
myisam/mi_preload.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'myisam/myisamchk.c')
| -rw-r--r-- | myisam/myisamchk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index b7f8d561a5b..94fbea87de3 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -1020,7 +1020,8 @@ static int myisamchk(MI_CHECK *param, my_string filename) !(param->testflag & (T_FAST | T_FORCE_CREATE))) { if (param->testflag & (T_EXTEND | T_MEDIUM)) - VOID(init_key_cache(param->use_buffers)); + VOID(init_key_cache(&dflt_keycache,dflt_key_block_size, + param->use_buffers)); VOID(init_io_cache(¶m->read_cache,datafile, (uint) param->read_buffer_length, READ_CACHE, @@ -1437,7 +1438,7 @@ static int mi_sort_records(MI_CHECK *param, if (share->state.key_root[sort_key] == HA_OFFSET_ERROR) DBUG_RETURN(0); /* Nothing to do */ - init_key_cache(param->use_buffers); + init_key_cache(&dflt_keycache,dflt_key_block_size,param->use_buffers); if (init_io_cache(&info->rec_cache,-1,(uint) param->write_buffer_length, WRITE_CACHE,share->pack.header_length,1, MYF(MY_WME | MY_WAIT_IF_FULL))) |