diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
| commit | 13029651b5535d637aa6f652f17c8c4417a803bc (patch) | |
| tree | b65c4d4bf3227b2e2b86c13f4d098b57e9a60410 /storage/xtradb/include/sync0rw.h | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 5b0ab60a4bfb4d5b603cd929b7ceb0d9fd1bac22 (diff) | |
| download | mariadb-git-13029651b5535d637aa6f652f17c8c4417a803bc.tar.gz | |
Merge XtraDB 9 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/sync0rw.h')
| -rw-r--r-- | storage/xtradb/include/sync0rw.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/xtradb/include/sync0rw.h b/storage/xtradb/include/sync0rw.h index aedfd5f3f86..85fa014d77a 100644 --- a/storage/xtradb/include/sync0rw.h +++ b/storage/xtradb/include/sync0rw.h @@ -120,7 +120,7 @@ is necessary only if the memory block containing it is freed. */ # endif /* UNIV_SYNC_DEBUG */ #else /* UNIV_DEBUG */ # define rw_lock_create(L, level) \ - rw_lock_create_func((L), __FILE__, __LINE__) + rw_lock_create_func((L), #L, NULL, 0) #endif /* UNIV_DEBUG */ /******************************************************************//** @@ -137,8 +137,8 @@ rw_lock_create_func( # ifdef UNIV_SYNC_DEBUG ulint level, /*!< in: level */ # endif /* UNIV_SYNC_DEBUG */ - const char* cmutex_name, /*!< in: mutex name */ #endif /* UNIV_DEBUG */ + const char* cmutex_name, /*!< in: mutex name */ const char* cfile_name, /*!< in: file name where created */ ulint cline); /*!< in: file line where created */ /******************************************************************//** @@ -540,7 +540,8 @@ struct rw_lock_struct { ulint level; /*!< Level in the global latching order. */ #endif /* UNIV_SYNC_DEBUG */ ulint count_os_wait; /*!< Count of os_waits. May not be accurate */ - const char* cfile_name;/*!< File name where lock created */ + //const char* cfile_name;/*!< File name where lock created */ + const char* lock_name;/*!< lock name */ /* last s-lock file/line is not guaranteed to be correct */ const char* last_s_file_name;/*!< File name where last s-locked */ const char* last_x_file_name;/*!< File name where last x-locked */ @@ -551,7 +552,7 @@ struct rw_lock_struct { are at the start of this struct, thus we can peek this field without causing much memory bus traffic */ - unsigned cline:14; /*!< Line where created */ + //unsigned cline:14; /*!< Line where created */ unsigned last_s_line:14; /*!< Line number where last time s-locked */ unsigned last_x_line:14; /*!< Line number where last time x-locked */ ulint magic_n; /*!< RW_LOCK_MAGIC_N */ |