diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2007-01-17 12:59:54 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2007-01-17 12:59:54 +0400 |
| commit | c7fb31ca108a546e2b2c37f0742aa34a0fb6fb0f (patch) | |
| tree | 06c416360155581a291a794e740bdb5f3abbd71a /myisam/mi_open.c | |
| parent | 5be1fda5b9ac1b55042c14c40b8c8c57dd01d981 (diff) | |
| parent | 61a2861973c7e4e7fa9fa1e48ed3499390c72d56 (diff) | |
| download | mariadb-git-c7fb31ca108a546e2b2c37f0742aa34a0fb6fb0f.tar.gz | |
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
Diffstat (limited to 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index dc3cfa82165..3a04027f2d5 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -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) |