diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:46:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:46:05 +0300 |
| commit | 5ece2155cba93a9a57e37d0c4ec624145cf8d4cf (patch) | |
| tree | cec927b268e9ac53767573ce21d53b811a9662ce /storage/innobase/lock/lock0lock.cc | |
| parent | db6e5bd9aaec7239d7c62820849a61b1059e4ad9 (diff) | |
| parent | b8e694a314b538b8bebec03a78b6df6570bd608b (diff) | |
| download | mariadb-git-5ece2155cba93a9a57e37d0c4ec624145cf8d4cf.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/lock/lock0lock.cc')
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 61052b15431..622e5ba7515 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -6207,7 +6207,7 @@ static my_bool lock_table_locks_lookup(rw_trx_hash_element_t *element, ut_ad(lock->trx == element->trx); if (lock_get_type_low(lock) == LOCK_REC) { - ut_ad(!dict_index_is_online_ddl(lock->index) || + ut_ad(lock->index->online_status != ONLINE_INDEX_CREATION || lock->index->is_primary()); ut_ad(lock->index->table != table); } |