diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 19:18:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 19:18:34 +0300 |
| commit | c277bcd591821b9956bf0d0c0a71ceb3e230f060 (patch) | |
| tree | 46467107f92c2b665e9ebadcda68c4fa0f494c75 /storage/innobase/dict | |
| parent | 9be0b6140719b7169fa30f54c86519e86b290205 (diff) | |
| parent | f3160ee44f8f3ae4e5eeea768e289ec40253f35e (diff) | |
| download | mariadb-git-c277bcd591821b9956bf0d0c0a71ceb3e230f060.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/dict')
| -rw-r--r-- | storage/innobase/dict/dict0crea.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0stats.cc | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index fd45aee407d..eba70aca6d1 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -1623,7 +1623,7 @@ dict_create_or_check_foreign_constraint_tables(void) row_mysql_unlock_data_dictionary(trx); - trx_free(trx); + trx->free(); srv_file_per_table = srv_file_per_table_backup; @@ -1724,7 +1724,7 @@ dict_create_or_check_sys_virtual() row_mysql_unlock_data_dictionary(trx); - trx_free(trx); + trx->free(); srv_file_per_table = srv_file_per_table_backup; @@ -2257,7 +2257,7 @@ dict_create_or_check_sys_tablespace(void) row_mysql_unlock_data_dictionary(trx); - trx_free(trx); + trx->free(); srv_file_per_table = srv_file_per_table_backup; diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 80f4347979e..a97a5cfca5d 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -438,7 +438,7 @@ dict_table_try_drop_aborted( } row_mysql_unlock_data_dictionary(trx); - trx_free(trx); + trx->free(); } /**********************************************************************//** @@ -2077,7 +2077,7 @@ dict_table_remove_from_cache_low( row_merge_drop_indexes_dict(trx, table->id); trx_commit_for_mysql(trx); trx->dict_operation_lock_mode = 0; - trx_free(trx); + trx->free(); } /* Free virtual column template if any */ diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 2214e398c5f..f530f7f6268 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -902,7 +902,7 @@ dict_update_filepath( trx_commit_for_mysql(trx); trx->dict_operation_lock_mode = 0; - trx_free(trx); + trx->free(); if (UNIV_LIKELY(err == DB_SUCCESS)) { /* We just updated SYS_DATAFILES due to the contents in @@ -964,7 +964,7 @@ dict_replace_tablespace_and_filepath( trx_commit_for_mysql(trx); trx->dict_operation_lock_mode = 0; - trx_free(trx); + trx->free(); return(err); } diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc index 488ff6ae915..758a95017c9 100644 --- a/storage/innobase/dict/dict0stats.cc +++ b/storage/innobase/dict/dict0stats.cc @@ -326,7 +326,7 @@ dict_stats_exec_sql( } if (trx_started) { - trx_free(trx); + trx->free(); } return(err); @@ -2577,7 +2577,7 @@ dict_stats_save( trx_commit_for_mysql(trx); end: - trx_free(trx); + trx->free(); mutex_exit(&dict_sys->mutex); rw_lock_x_unlock(&dict_operation_lock); @@ -3053,7 +3053,7 @@ dict_stats_fetch_from_ps( trx_commit_for_mysql(trx); - trx_free(trx); + trx->free(); if (!index_fetch_arg.stats_were_modified) { return(DB_STATS_DO_NOT_EXIST); |