diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 21:18:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 21:18:15 +0300 |
| commit | 2bf93a8fd6d8d7563edc248183ca8b54a5d76dff (patch) | |
| tree | aeee1a3aeb5196092975248cb4e60760d9c40f4f /storage/innobase/lock | |
| parent | 6b5f7ddc78e5e4796031fba27583d9b20504d529 (diff) | |
| parent | 294ac1fbab306e97dad3588a00e3527f2056e7e4 (diff) | |
| download | mariadb-git-2bf93a8fd6d8d7563edc248183ca8b54a5d76dff.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/lock')
| -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 8fe5a8f720f..5caa8ea60a8 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -6314,7 +6314,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); } |