From: Date: January 16 2007 3:05pm
Subject: bk commit into 4.1 tree (svoj:1.2590) BUG#24855
List-Archive: http://lists.mysql.com/commits/18187
X-Bug: 24855
Message-Id: <20070116140539.74B8241CEC0@june.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj 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, 2007-01-16 18:05:37+04:00, svoj@stripped +1 -0
  BUG#24855 - Crash mysqld 4.1.21 with corrupted tables
  
  Accessing fixed record format table with crashed key definition results
  in server/myisamchk segmentation fault.
  
  This is fixed by refusing to open such tables. Affects MyISAM only.
  No test case, since it requires crashed table.

  myisam/mi_open.c@stripped, 2007-01-16 18:05:36+04:00, svoj@stripped +7 -1
    Refuse to open fixed record format table with key segment that includes
    BLOB part (which is true only for tables with crashed key definition).

# 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:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG24855/mysql-4.1-engines

--- 1.88/myisam/mi_open.c	2006-12-02 02:11:39 +04:00
+++ 1.89/myisam/mi_open.c	2007-01-16 18:05:36 +04:00
@@ -315,7 +315,13 @@ MI_INFO *mi_open(const char *name, int m
 	for (j=0 ; j < share->keyinfo[i].keysegs; j++,pos++)
 	{
 	  disk_pos=mi_keyseg_read(disk_pos, pos);
-
+          if (pos->flag & HA_BLOB_PART &&
+              ! (share->options & (HA_OPTION_COMPRESS_RECORD |
+                                   HA_OPTION_PACK_RECORD)))
+          {
+            my_errno= HA_ERR_CRASHED;
+            goto err;
+          }
 	  if (pos->type == HA_KEYTYPE_TEXT || pos->type == HA_KEYTYPE_VARTEXT)
 	  {
 	    if (!pos->language)