List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 14 2010 4:23pm
Subject:bzr commit into mysql-trunk-bugfixing branch (marc.alff:3106)
View as plain text  
#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


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100714162321-v9yj1jv00ahezzmr.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (marc.alff:3106) Marc Alff14 Jul