diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 17:28:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 17:28:08 +0300 |
| commit | 1e3886ae80c44a39ec3e4061b4ea3131cdcef213 (patch) | |
| tree | ce95518792d1432b669ba13a248928e74e81a9bb /storage/myisam/mi_extra.c | |
| parent | 0fe7d8a2a221196d977e5efe3f3dedb22806bb53 (diff) | |
| parent | 3a7201ea922f6d3373924c413fdb4b108f6208c5 (diff) | |
| download | mariadb-git-1e3886ae80c44a39ec3e4061b4ea3131cdcef213.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/myisam/mi_extra.c')
| -rw-r--r-- | storage/myisam/mi_extra.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c index 8a2bc82d166..d0ec858439c 100644 --- a/storage/myisam/mi_extra.c +++ b/storage/myisam/mi_extra.c @@ -150,6 +150,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) if (info->s->data_file_type != DYNAMIC_RECORD) break; /* Remove read/write cache if dynamic rows */ + /* fall through */ case HA_EXTRA_NO_CACHE: if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED)) { @@ -262,7 +263,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) share->deleting= TRUE; share->global_changed= FALSE; /* force writing changed flag */ _mi_mark_file_changed(info); - /* Fall trough */ + /* Fall through */ case HA_EXTRA_PREPARE_FOR_RENAME: DBUG_ASSERT(!share->temporary); mysql_mutex_lock(&THR_LOCK_myisam); |