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

into chilla.local:/home/mydev/mysql-5.0-bug20719 myisam/mi_dynrec.c: Auto merged

Merge chilla.local:/home/mydev/mysql-4.1-bug20719
into chilla.local:/home/mydev/mysql-5.0-bug20719 myisam/mi_dynrec.c: Auto merged
86400c60 · unknown · 884062f3 · 721b1d7f · 86400c60
Commit 86400c60 authored Jul 29, 2006 by unknown
Hide 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
@@ -1180,6 +1180,9 @@ 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))