diff options
| author | unknown <istruewing@chilla.local> | 2007-01-17 14:52:36 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-17 14:52:36 +0100 |
| commit | 2456c61d3971ae6a37beeb78ad2efc6809b6694d (patch) | |
| tree | d97ea3ab40d707df63973394f934f1182c224e0a /myisam | |
| parent | 422d6b357f90d404f58bdd4444c048a760f0d9f8 (diff) | |
| parent | 61a2861973c7e4e7fa9fa1e48ed3499390c72d56 (diff) | |
| download | mariadb-git-2456c61d3971ae6a37beeb78ad2efc6809b6694d.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1--team
into chilla.local:/home/mydev/mysql-4.1-bug24607
Diffstat (limited to 'myisam')
| -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 4efe6f42d5e..047686278b4 100644 --- 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) |