Merge chilla.local:/home/mydev/mysql-4.1-bug19835

into chilla.local:/home/mydev/mysql-4.1-amerge

Merge chilla.local:/home/mydev/mysql-4.1-bug19835
into chilla.local:/home/mydev/mysql-4.1-amerge
987abbc2 · ingo/mydev@chilla.local · d341ca94 · 9dd5bc38 · 987abbc2
Commit 987abbc2 authored Jul 08, 2006 by ingo/mydev@chilla.local
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

myisam/mi_dynrec.c myisam/mi_dynrec.c +3 -0

No files found.
--- a/myisam/mi_dynrec.c
+++ b/myisam/mi_dynrec.c
@@ -1116,6 +1116,9 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf)
 	  info->rec_cache.pos_in_file <= block_info.next_filepos &&
 	  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,
 				     block_info.next_filepos))