Commit 2e9f070c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.1-engines


storage/myisam/mi_open.c:
  Auto merged
parents a7b4e0ff c7fb31ca

storage/myisam/mi_open.c

+7 −1
Original line number Diff line number Diff line
@@ -334,7 +334,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_VARTEXT1 ||

              pos->type == HA_KEYTYPE_VARTEXT2)