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

into chilla.local:/home/mydev/mysql-4.1-bug24607
19 years ago · 2456c61d39
1 changed files with 7 additions and 1 deletions
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@ -315,7 +315,13 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
 	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)