diff options
| author | unknown <svoj@june.mysql.com> | 2007-01-17 13:11:37 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-01-17 13:11:37 +0400 |
| commit | 2e9f070cc2f828bdebca05ff8d132601c8b8dcf5 (patch) | |
| tree | 8da7eee5fde0f80f0ed5e920e8128e90db17e3ff /storage/myisam/mi_open.c | |
| parent | a7b4e0ff3fc02aafb2d07fc23e932b955f8a90a5 (diff) | |
| parent | c7fb31ca108a546e2b2c37f0742aa34a0fb6fb0f (diff) | |
| download | mariadb-git-2e9f070cc2f828bdebca05ff8d132601c8b8dcf5.tar.gz | |
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
Diffstat (limited to 'storage/myisam/mi_open.c')
| -rw-r--r-- | storage/myisam/mi_open.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c index b5e9817098b..8a5a2e009a7 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -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) |