Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-07-29 21:59:36+02:00, ingo@stripped +1 -0
Merge chilla.local:/home/mydev/mysql-4.1-bug20719
into chilla.local:/home/mydev/mysql-5.0-bug20719
MERGE: 1.1616.2640.4
myisam/mi_dynrec.c@stripped, 2006-07-29 21:59:32+02:00, ingo@stripped +0 -0
Auto merged
MERGE: 1.36.2.2
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: ingo
# Host: chilla.local
# Root: /home/mydev/mysql-5.0-bug20719/RESYNC
--- 1.41/myisam/mi_dynrec.c 2006-07-29 21:59:41 +02:00
+++ 1.42/myisam/mi_dynrec.c 2006-07-29 21:59:41 +02:00
@@ -1180,6 +1180,9 @@ int _mi_read_dynamic_record(MI_INFO *inf
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))
| Thread |
|---|
| • bk commit into 5.0 tree (ingo:1.2209) | ingo | 29 Jul |