diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-14 16:28:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 05779bc6f1a585156c572fbcd89c78b3b1f51f5d (patch) | |
| tree | 9ac80b8694aa9f21633f705cee7f08f7145c1e5d /storage | |
| parent | 22b6d8487aa08123c30092c1f1df48e31c79eff3 (diff) | |
| download | mariadb-git-05779bc6f1a585156c572fbcd89c78b3b1f51f5d.tar.gz | |
perfschema mdl related instrumentation changes
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 2 | ||||
| -rw-r--r-- | storage/spider/spd_copy_tables.cc | 2 | ||||
| -rw-r--r-- | storage/spider/spd_direct_sql.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 710edb59764..0747a571504 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -844,7 +844,7 @@ is_unaccessible: mutex_exit(&dict_sys.mutex); { MDL_request request; - request.init(MDL_key::TABLE, db_buf, tbl_buf, MDL_SHARED, MDL_EXPLICIT); + MDL_REQUEST_INIT(&request,MDL_key::TABLE, db_buf, tbl_buf, MDL_SHARED, MDL_EXPLICIT); if (trylock ? mdl_context->try_acquire_lock(&request) : mdl_context->acquire_lock(&request, diff --git a/storage/spider/spd_copy_tables.cc b/storage/spider/spd_copy_tables.cc index 1a472e2c12b..19023a00da3 100644 --- a/storage/spider/spd_copy_tables.cc +++ b/storage/spider/spd_copy_tables.cc @@ -997,7 +997,7 @@ long long spider_copy_tables_body( #if MYSQL_VERSION_ID < 50500 if (open_and_lock_tables(thd, table_list)) #else - table_list->mdl_request.init( + MDL_REQUEST_INIT(&table_list->mdl_request, MDL_key::TABLE, SPIDER_TABLE_LIST_db_str(table_list), SPIDER_TABLE_LIST_table_name_str(table_list), diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc index 7bf0b91a4a7..406d189fcc9 100644 --- a/storage/spider/spd_direct_sql.cc +++ b/storage/spider/spd_direct_sql.cc @@ -1751,7 +1751,7 @@ long long spider_direct_sql_body( SPIDER_TABLE_LIST_table_name_length(&table_list), SPIDER_TABLE_LIST_table_name_str(&table_list), TL_WRITE); #endif - tables->mdl_request.init(MDL_key::TABLE, + MDL_REQUEST_INIT(&tables->mdl_request, MDL_key::TABLE, SPIDER_TABLE_LIST_db_str(&table_list), SPIDER_TABLE_LIST_table_name_str(&table_list), MDL_SHARED_WRITE, MDL_TRANSACTION); |