diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-30 06:20:32 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-30 06:20:32 +0200 |
| commit | 3232bd58e861d873ae1cfe9f4ceefe6529ff90a3 (patch) | |
| tree | 69157f1735e9d58a4cc596f2a4dabd60f016afc3 /storage/myisam/mi_dynrec.c | |
| parent | e74b5ed82b9d6788431a6cb6103a3c5ea71405d7 (diff) | |
| parent | 9493d46476230837d7bc27d5c938105d471bb5a4 (diff) | |
| download | mariadb-git-3232bd58e861d873ae1cfe9f4ceefe6529ff90a3.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-bug20719
into chilla.local:/home/mydev/mysql-5.1-bug20719
storage/myisam/mi_dynrec.c:
Auto merged
Diffstat (limited to 'storage/myisam/mi_dynrec.c')
| -rw-r--r-- | storage/myisam/mi_dynrec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c index ccaafa914a9..8d45333137e 100644 --- a/storage/myisam/mi_dynrec.c +++ b/storage/myisam/mi_dynrec.c @@ -1354,13 +1354,13 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf) block_info.second_read= 0; do { + /* A corrupted table can have wrong pointers. (Bug# 19835) */ + if (filepos == HA_OFFSET_ERROR) + goto panic; if (info->opt_flag & WRITE_CACHE_USED && info->rec_cache.pos_in_file < filepos + MI_BLOCK_INFO_HEADER_LENGTH && flush_io_cache(&info->rec_cache)) goto err; - /* A corrupted table can have wrong pointers. (Bug# 19835) */ - if (block_info.next_filepos == HA_OFFSET_ERROR) - goto panic; info->rec_cache.seek_not_done=1; if ((b_type= _mi_get_block_info(&block_info, file, filepos)) & (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR | |