mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines myisam/mi_open.c: Auto merged
This commit is contained in:
commit
c7fb31ca10
1 changed files with 7 additions and 1 deletions
|
@ -322,7 +322,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)
|
||||
|
|
Loading…
Reference in a new issue