diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-05 12:37:51 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-05 12:37:51 +0200 |
| commit | c670b9021e782ead4cdd0d20ead2421367626ea5 (patch) | |
| tree | 4178c9a4656d1df6bfbabc07b9962deb25d57ab5 /storage/myisam/mi_extra.c | |
| parent | fdd6963890d5cd793155d135c3fa321ecb5b704d (diff) | |
| parent | 7647c2744c95f23fa7a1f4aec98359f5a9a55e01 (diff) | |
| download | mariadb-git-c670b9021e782ead4cdd0d20ead2421367626ea5.tar.gz | |
Automerge with 5.2
Diffstat (limited to 'storage/myisam/mi_extra.c')
| -rw-r--r-- | storage/myisam/mi_extra.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c index deeb5d87cc1..648e5fb0024 100644 --- a/storage/myisam/mi_extra.c +++ b/storage/myisam/mi_extra.c @@ -392,6 +392,11 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) share->is_log_table= TRUE; pthread_mutex_unlock(&share->intern_lock); break; + case HA_EXTRA_DETACH_CHILD: /* When used with MERGE tables */ + info->open_flag&= ~HA_OPEN_MERGE_TABLE; + info->lock.priority&= ~THR_LOCK_MERGE_PRIV; + break; + case HA_EXTRA_KEY_CACHE: case HA_EXTRA_NO_KEY_CACHE: default: |