diff options
| author | Monty <monty@mariadb.org> | 2018-05-24 11:08:02 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-05-24 11:08:02 +0300 |
| commit | e744c687ca2c2523b63d5ac0066276a6cb3e932f (patch) | |
| tree | 7d3fbd9457d9a6f074d4c8dbb925fcb65730e135 /storage/maria/ma_extra.c | |
| parent | 5797cbaf4ab93cdae191486c6c82be79b83c56d2 (diff) | |
| parent | a816aa066e5c879a92819d694a93d245e6ec6e47 (diff) | |
| download | mariadb-git-e744c687ca2c2523b63d5ac0066276a6cb3e932f.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'storage/maria/ma_extra.c')
| -rw-r--r-- | storage/maria/ma_extra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_extra.c b/storage/maria/ma_extra.c index 6c74bb52f51..f3800bc36be 100644 --- a/storage/maria/ma_extra.c +++ b/storage/maria/ma_extra.c @@ -345,7 +345,7 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, _ma_decrement_open_count(info, 0); if (info->trn) { - _ma_remove_table_from_trnman(share, info->trn); + _ma_remove_table_from_trnman(info); /* Ensure we don't point to the deleted data in trn */ info->state= info->state_start= &share->state.state; } @@ -408,7 +408,7 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, if (info->trn) { mysql_mutex_lock(&share->intern_lock); - _ma_remove_table_from_trnman(share, info->trn); + _ma_remove_table_from_trnman(info); /* Ensure we don't point to the deleted data in trn */ info->state= info->state_start= &share->state.state; mysql_mutex_unlock(&share->intern_lock); |