diff options
| -rw-r--r-- | storage/innobase/include/os0file.ic | 20 | ||||
| -rw-r--r-- | storage/innobase/include/sync0rw.ic | 17 | ||||
| -rw-r--r-- | storage/innobase/row/row0merge.c | 8 |
3 files changed, 22 insertions, 23 deletions
diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic index 82d157df605..648070c6909 100644 --- a/storage/innobase/include/os0file.ic +++ b/storage/innobase/include/os0file.ic @@ -55,7 +55,7 @@ pfs_os_file_create_simple_func( { os_file_t file; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; /* register a file open or creation depending on "create_mode" */ register_pfs_file_open_begin(&state, locker, key, @@ -102,7 +102,7 @@ pfs_os_file_create_simple_no_error_handling_func( { os_file_t file; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; /* register a file open or creation depending on "create_mode" */ register_pfs_file_open_begin(&state, locker, key, @@ -155,7 +155,7 @@ pfs_os_file_create_func( { os_file_t file; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; /* register a file open or creation depending on "create_mode" */ register_pfs_file_open_begin(&state, locker, key, @@ -186,7 +186,7 @@ pfs_os_file_close_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; /* register the file close */ register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_CLOSE, @@ -234,7 +234,7 @@ pfs_os_aio_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; /* Register the read or write I/O depending on "type" */ register_pfs_file_io_begin(&state, locker, file, n, @@ -273,7 +273,7 @@ pfs_os_file_read_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_READ, src_file, src_line); @@ -309,7 +309,7 @@ pfs_os_file_read_no_error_handling_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_READ, src_file, src_line); @@ -346,7 +346,7 @@ pfs_os_file_write_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_WRITE, src_file, src_line); @@ -374,7 +374,7 @@ pfs_os_file_flush_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_SYNC, src_file, src_line); @@ -404,7 +404,7 @@ pfs_os_file_rename_func( { ibool result; struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + PSI_file_locker_state state; register_pfs_file_open_begin(&state, locker, key, PSI_FILE_RENAME, newpath, src_file, src_line); diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic index adaddba93e0..2ffd9fdafb5 100644 --- a/storage/innobase/include/sync0rw.ic +++ b/storage/innobase/include/sync0rw.ic @@ -675,8 +675,8 @@ pfs_rw_lock_x_lock_func( const char* file_name,/*!< in: file name where lock requested */ ulint line) /*!< in: line where requested */ { - struct PSI_rwlock_locker* locker = NULL; - PSI_rwlock_locker_state state; + struct PSI_rwlock_locker* locker = NULL; + PSI_rwlock_locker_state state; /* Record the entry of rw x lock request in performance schema */ if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) { @@ -710,8 +710,8 @@ pfs_rw_lock_x_lock_func_nowait( requested */ ulint line) /*!< in: line where requested */ { - struct PSI_rwlock_locker* locker = NULL; - PSI_rwlock_locker_state state; + struct PSI_rwlock_locker* locker = NULL; + PSI_rwlock_locker_state state; ibool ret; /* Record the entry of rw x lock request in performance schema */ @@ -766,8 +766,8 @@ pfs_rw_lock_s_lock_func( requested */ ulint line) /*!< in: line where requested */ { - struct PSI_rwlock_locker* locker = NULL; - PSI_rwlock_locker_state state; + struct PSI_rwlock_locker* locker = NULL; + PSI_rwlock_locker_state state; /* Instrumented to inform we are aquiring a shared rwlock */ if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) { @@ -801,9 +801,8 @@ pfs_rw_lock_s_lock_low( const char* file_name, /*!< in: file name where lock requested */ ulint line) /*!< in: line where requested */ { - - struct PSI_rwlock_locker* locker = NULL; - PSI_rwlock_locker_state state; + struct PSI_rwlock_locker* locker = NULL; + PSI_rwlock_locker_state state; ibool ret; /* Instrumented to inform we are aquiring a shared rwlock */ diff --git a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c index 6e7a1b41ab0..eac2f9fb377 100644 --- a/storage/innobase/row/row0merge.c +++ b/storage/innobase/row/row0merge.c @@ -2164,8 +2164,8 @@ row_merge_file_create( /* This temp file open does not go through normal file APIs, add instrumentation to register with performance schema */ - struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + struct PSI_file_locker* locker = NULL; + PSI_file_locker_state state; register_pfs_file_open_begin(&state, locker, innodb_file_temp_key, PSI_FILE_OPEN, "Innodb Merge Temp File", @@ -2188,8 +2188,8 @@ row_merge_file_destroy( merge_file_t* merge_file) /*!< out: merge file structure */ { #ifdef UNIV_PFS_IO - struct PSI_file_locker* locker = NULL; - PSI_file_locker_state state; + struct PSI_file_locker* locker = NULL; + PSI_file_locker_state state; register_pfs_file_io_begin(&state, locker, merge_file->fd, 0, PSI_FILE_CLOSE, __FILE__, __LINE__); #endif |