diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-18 13:51:48 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-18 13:51:48 +0200 |
| commit | 6b671182125b2e3aa19cc65f0ecf1fbb5df194ad (patch) | |
| tree | 083e126c99f25d93a326bfde6eab71e95addb881 /myisam/myisamchk.c | |
| parent | 5a24433d271e6317886102448f2b60728b738940 (diff) | |
| parent | e72124c4ccad5b390b84562389175dcd7355769c (diff) | |
| download | mariadb-git-6b671182125b2e3aa19cc65f0ecf1fbb5df194ad.tar.gz | |
merge
myisam/ft_nlq_search.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to 'myisam/myisamchk.c')
| -rw-r--r-- | myisam/myisamchk.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 9136117b86e..9f97f352d39 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -715,6 +715,7 @@ static void get_options(register int *argc,register char ***argv) exit(1); check_param.tmpdir=&myisamchk_tmpdir; + check_param.key_cache_block_size= opt_key_cache_block_size; if (set_charset_name) if (!(set_charset=get_charset_by_name(set_charset_name, MYF(MY_WME)))) @@ -1047,7 +1048,7 @@ static int myisamchk(MI_CHECK *param, my_string filename) HA_OPTION_COMPRESS_RECORD)) || (param->testflag & (T_EXTEND | T_MEDIUM))) error|=chk_data_link(param, info, param->testflag & T_EXTEND); - error|=flush_blocks(param,share->kfile); + error|=flush_blocks(param, *share->key_cache, share->kfile); VOID(end_io_cache(¶m->read_cache)); } if (!error) @@ -1456,7 +1457,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(dflt_keycache,opt_key_cache_block_size,param->use_buffers, + init_key_cache(dflt_keycache, opt_key_cache_block_size, param->use_buffers, &dflt_key_cache_var); if (init_io_cache(&info->rec_cache,-1,(uint) param->write_buffer_length, WRITE_CACHE,share->pack.header_length,1, @@ -1571,7 +1572,8 @@ err: my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR)); sort_info.buff=0; share->state.sortkey=sort_key; - DBUG_RETURN(flush_blocks(param, share->kfile) | got_error); + DBUG_RETURN(flush_blocks(param, *share->key_cache, share->kfile) | + got_error); } /* sort_records */ |