diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2007-05-23 12:38:34 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2007-05-23 12:38:34 +0500 |
| commit | e5b2adeac1af976323f61700dd00694b9063e17f (patch) | |
| tree | f3d76e21e36cfecb2630972071b33b496b3477a9 /myisam | |
| parent | 05464a4f457b5167749e67a4951f20dcc2fa196b (diff) | |
| parent | a656c71e8ae765ea194a59a69d440d203308f235 (diff) | |
| download | mariadb-git-e5b2adeac1af976323f61700dd00694b9063e17f.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 3a7817b7f03..ce8fb04874e 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -336,7 +336,7 @@ int chk_size(MI_CHECK *param, register MI_INFO *info) flush_key_blocks(info->s->key_cache, info->s->kfile, FLUSH_FORCE_WRITE); - size=my_seek(info->s->kfile,0L,MY_SEEK_END,MYF(0)); + size= my_seek(info->s->kfile, 0L, MY_SEEK_END, MYF(MY_THREADSAFE)); if ((skr=(my_off_t) info->state->key_file_length) != size) { if (skr > size) @@ -595,7 +595,8 @@ static int chk_index_down(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo, { /* purecov: begin tested */ /* Give it a chance to fit in the real file size. */ - my_off_t max_length= my_seek(info->s->kfile, 0L, MY_SEEK_END, MYF(0)); + my_off_t max_length= my_seek(info->s->kfile, 0L, MY_SEEK_END, + MYF(MY_THREADSAFE)); mi_check_print_error(param, "Invalid key block position: %s " "key block size: %u file_length: %s", llstr(page, llbuff), keyinfo->block_length, @@ -4039,10 +4040,10 @@ int test_if_almost_full(MI_INFO *info) { if (info->s->options & HA_OPTION_COMPRESS_RECORD) return 0; - return (my_seek(info->s->kfile,0L,MY_SEEK_END,MYF(0))/10*9 > - (my_off_t) (info->s->base.max_key_file_length) || - my_seek(info->dfile,0L,MY_SEEK_END,MYF(0))/10*9 > - (my_off_t) info->s->base.max_data_file_length); + return my_seek(info->s->kfile, 0L, MY_SEEK_END, MYF(MY_THREADSAFE)) / 10 * 9 > + (my_off_t) info->s->base.max_key_file_length || + my_seek(info->dfile, 0L, MY_SEEK_END, MYF(0)) / 10 * 9 > + (my_off_t) info->s->base.max_data_file_length; } /* Recreate table with bigger more alloced record-data */ |