From: Marc Alff Date: July 14 2010 4:23pm Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3106) List-Archive: http://lists.mysql.com/commits/113607 Message-Id: <20100714162330.0E04245E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8129662924538634258==" --===============8129662924538634258== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-55087/ based on revid:marc.alff@stripped 3106 Marc Alff 2010-07-14 Implemented code review comments. Fixed style according to the specific innodb style, for innodb code. modified: storage/innobase/include/os0file.ic storage/innobase/include/sync0rw.ic storage/innobase/row/row0merge.c === modified file 'storage/innobase/include/os0file.ic' --- a/storage/innobase/include/os0file.ic 2010-07-09 23:00:24 +0000 +++ b/storage/innobase/include/os0file.ic 2010-07-14 16:23:21 +0000 @@ -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_handl { 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); === modified file 'storage/innobase/include/sync0rw.ic' --- a/storage/innobase/include/sync0rw.ic 2010-07-09 23:00:24 +0000 +++ b/storage/innobase/include/sync0rw.ic 2010-07-14 16:23:21 +0000 @@ -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 */ === modified file 'storage/innobase/row/row0merge.c' --- a/storage/innobase/row/row0merge.c 2010-07-09 23:00:24 +0000 +++ b/storage/innobase/row/row0merge.c 2010-07-14 16:23:21 +0000 @@ -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 --===============8129662924538634258== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\ # 55087/ # testament_sha1: f22c5fa051647155bbe9b717d2dde47c409ac3ff # timestamp: 2010-07-14 10:23:29 -0600 # base_revision_id: marc.alff@stripped\ # qis6ehy2cl753qa4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVKtRPUAA5VfgAAwUnf//3Mn SgC////wUAYe47lyKAIG0YVIISSI0k9T0ap+TaVP1D9TTKh+lAMjJkPU/VBoJJAJkAp6m1J6EabU AABoAAYpp6kp6hvSg0DagADQabUAABzTEwAJgAmAAEwABMEUiNJqbQ1No1E8U9T0NTeoTKekaAbU 0ep5hIAzDIGYTHS9ZCwF46ceqe+tWCI/fzfYOy0jJtY54gSYM6Svd7iqVJ2OHkvU7aRpbJqWUAkA EkifTwBPxOixacrlcrAUIV0pNyrE4bkk4cIKTdlzmqJqaaFrkdBAYawNeMGoO5hh9wfD9P7Ktd05 lNgaFzxdPdpu1wsLjSyk/u0SIMgvMj5DH7KB2p0jyY5SpFN6UGoBjwW1Bdig3UoOMud6lrkI3zO6 0BahEWGGuUVVTMs969TQESYXWwDMnMzNfJPktYAGx/BHIoAZoI3EzRToQTUnQuLpgEWZiJNCtLGg O8oSnVaeiGx2OdvFsh0CW9sAHrhWdRz4z7MSqvMh1G10Uz2lLk/Fuc3MAij26QQrO5ZdBgZDlqam WRkREWIL3oPU6h4HGr7GqqOQR4foRIVoS6nPmMPdmzdQB1nQIi+5SY3c7O5SEPLlHEtE3wmpcsHd RwI6UNlMy2DaboPqiaTsd3EtMNGtg75CU01FRiuCJVA4oNx4VQZnVM2ouYIlUwVGRFgDd5Bn1Jlp wGBiReg5K+84DRuwspSWBC+xkMMY798XNcoa6UUSECxZbSImKDpHkKoJjZZvHk5RxHFzApEVkPWe B2Yk7VQVWpcceOpIjs9F4XFEEd7Gw3auaOVObZwznjTgSygtBkKE0E0ZKiCVxPnITIj9IEt5ElSG qGrrQauY5XRiMtWQUqt0DPGH6EbKuWUolTDOEMtOeW1S8qOdrHG9nOwQTMB4a4lKrhZBJbFiI507 6a3w0MSTT5CL4WMX0cD7MVo05pYPBoshqNEIilNqI/gekA8w1LlhUQkXPBnNx3vjrLy9PggXSM2i IICD9pTAnCn3FN/SPsMswH2BgID2FPYfuLnxIiNsAeAEA8/WgFByANxUBxMiaHM/D28ivI99n1uQ L818x0CeiB67HXWl/47kC5CCsAI88g+iGnyMjIvPJkhQsOxPTDAyVMJE4YkgWIfSza2nDSpQ3y4I VnT5IeJNC464EP9VYwcIP8gQUp6AnFxLkA1tma6RYK9b9mZpx02NzNFEcO2+DyaXOGBU3OlA8hmT YHOv6kEWMglVRkAdwbfYyTvFMgHMJ1T7ctsjjhZ9Shp89wByWi4YMTM6xWCYStvhT56G4x0e9s8F lKuDQ5uK5wt8EzkfEFwvteATrldEMpjoSdJbE1VifDOhsPicwwKq0CSEiQdIhnT8Nb3vi+4vy3Te 4kYPcuXadYGNkwrE4NwJFZm5GuAln8NSxTjtC60RqL/ceI6bOdZWf91YWbB7DzdQ8rdVHh4CSchM MRhEMR/pu3BYNtGYW/JiaA5JGnniIN/HUDxFWJFVIu1AYC5ncDJ3Z63Q693e0wJ9BSoP14iSpWYs ByZNiVA1Q/PaMgkG0BzCZY6RBBOES1kggKt5RqgNgoPUnrMwr2CpI77mTIcGMHU2z/NaKK2UERdF 7weMMKE1T7JUISqkhd0cpBYHGxwlqwTClKA8GwCbUFUnBlqquvgLGgw4tiZaeFpQA5AFowNZLUat eceEocRvQCYASnptH4xXr3XFVo5ggZphOuEwrMKh6B698xr5iWiWu0DQ0YYAk5zpZLN/J8X9BMDs dDx25w6ysTP82BH/F3JFOFCQUq1E9Q== --===============8129662924538634258==--