diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2007-05-17 00:40:26 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2007-05-17 00:40:26 +0500 |
| commit | de0e4e0a2ba46a300b14b7b3e8b362ae3abac325 (patch) | |
| tree | 8c2fd9efea4fbaa16ecb999f75d73177dfce4a4d /myisam | |
| parent | 9cc05ced333a7c60bc0613867f4edeeee9e5e97a (diff) | |
| parent | e1e83a8b66dc59b1e46cd78db6a20b8ba2ea44ba (diff) | |
| download | mariadb-git-de0e4e0a2ba46a300b14b7b3e8b362ae3abac325.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
myisam/mi_check.c:
Auto merged
mysys/my_seek.c:
Manual merge.
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 444dc2a1da9..ed0a84e737d 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -335,7 +335,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) { /* Don't give error if file generated by myisampack */ @@ -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, @@ -4052,10 +4053,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 */ |