diff options
| author | serg@serg.mysql.com <> | 2002-10-08 14:34:04 +0000 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2002-10-08 14:34:04 +0000 |
| commit | e65536b14725d52443e30ee2229ee875a05e6e50 (patch) | |
| tree | c86321a262ba5ad3a010113a2251687c23675da4 /myisam/sort.c | |
| parent | 4842b82e9fc3dafc47b6a5c6774a22e90df7fe3f (diff) | |
| download | mariadb-git-e65536b14725d52443e30ee2229ee875a05e6e50.tar.gz | |
--tmpdir=dir1:dir2:... support in myisamchk
Diffstat (limited to 'myisam/sort.c')
| -rw-r--r-- | myisam/sort.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 79d31147bfc..5819fb7b493 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -553,8 +553,8 @@ static int NEAR_F write_keys(MI_SORT_PARAM *info, register uchar **sort_keys, qsort2((byte*) sort_keys,count,sizeof(byte*),(qsort2_cmp) info->key_cmp, info); if (!my_b_inited(tempfile) && - open_cached_file(tempfile, info->tmpdir, "ST", DISK_BUFFER_SIZE, - info->sort_info->param->myf_rw)) + open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST", + DISK_BUFFER_SIZE, info->sort_info->param->myf_rw)) DBUG_RETURN(1); /* purecov: inspected */ buffpek->file_pos=my_b_tell(tempfile); @@ -576,8 +576,8 @@ static int NEAR_F write_key(MI_SORT_PARAM *info, uchar *key, DBUG_ENTER("write_key"); if (!my_b_inited(tempfile) && - open_cached_file(tempfile, info->tmpdir, "ST", DISK_BUFFER_SIZE, - info->sort_info->param->myf_rw)) + open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST", + DISK_BUFFER_SIZE, info->sort_info->param->myf_rw)) DBUG_RETURN(1); if (my_b_write(tempfile,(byte*)&key_length,sizeof(key_length)) || @@ -619,8 +619,8 @@ static int NEAR_F merge_many_buff(MI_SORT_PARAM *info, uint keys, if (*maxbuffer < MERGEBUFF2) DBUG_RETURN(0); /* purecov: inspected */ if (flush_io_cache(t_file) || - open_cached_file(&t_file2,info->tmpdir,"ST",DISK_BUFFER_SIZE, - info->sort_info->param->myf_rw)) + open_cached_file(&t_file2,my_tmpdir(info->tmpdir),"ST", + DISK_BUFFER_SIZE, info->sort_info->param->myf_rw)) DBUG_RETURN(1); /* purecov: inspected */ from_file= t_file ; to_file= &t_file2; |