diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 12:52:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 12:52:57 +0300 |
| commit | 38f6c47f8a0a9bc313e4875c4676985249771c76 (patch) | |
| tree | 0cb876cdf2ead314e2fad565c9d71550cc40b412 /storage/innobase/dict | |
| parent | 9f20968169e21fcf8941041a8a7ce06013a79bd9 (diff) | |
| parent | 15fa70b8408a2146b300a4e1b19819addafa5929 (diff) | |
| download | mariadb-git-38f6c47f8a0a9bc313e4875c4676985249771c76.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/dict')
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 947fce1ae3a..c092d78fa0d 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -4521,7 +4521,7 @@ dict_create_foreign_constraints( heap = mem_heap_create(10000); err = dict_create_foreign_constraints_low( - trx, heap, innobase_get_charset(trx->mysql_thd), + trx, heap, thd_charset(trx->mysql_thd), str, name, reject_fks); mem_heap_free(heap); @@ -4556,7 +4556,7 @@ dict_foreign_parse_drop_constraints( ut_a(trx->mysql_thd); - cs = innobase_get_charset(trx->mysql_thd); + cs = thd_charset(trx->mysql_thd); *n = 0; diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index 295ddd14c5e..49c80cb4f5b 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -785,7 +785,6 @@ dict_mem_index_create( mutex_create(LATCH_ID_ZIP_PAD_MUTEX, &index->zip_pad.mutex); if (type & DICT_SPATIAL) { - mutex_create(LATCH_ID_RTR_SSN_MUTEX, &index->rtr_ssn.mutex); index->rtr_track = new (mem_heap_alloc(heap, sizeof *index->rtr_track)) rtr_info_track_t(); @@ -1098,7 +1097,7 @@ dict_mem_index_free( for (auto& rtr_info : index->rtr_track->rtr_active) { rtr_info->index = NULL; } - mutex_destroy(&index->rtr_ssn.mutex); + mutex_destroy(&index->rtr_track->rtr_active_mutex); index->rtr_track->~rtr_info_track_t(); } |