diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-06-02 15:40:49 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-06-02 15:40:49 +0300 |
| commit | 1a5cf2618b7c0b71280b981afdab79d7eaf33c91 (patch) | |
| tree | 1e5ecb2e90082889f6a03476932607b3dbb0d901 /storage/innobase/include/sync0rw.h | |
| parent | 2400a20c9b6efb909180e8386368da7acc128f84 (diff) | |
| parent | acf187a2760ed68b2bab55fd2b661842e53831c2 (diff) | |
| download | mariadb-git-1a5cf2618b7c0b71280b981afdab79d7eaf33c91.tar.gz | |
Merge mysql-trunk-innodb -> mysql-trunk-bugfixing
Diffstat (limited to 'storage/innobase/include/sync0rw.h')
| -rw-r--r-- | storage/innobase/include/sync0rw.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h index 6233ceef748..70471186f6d 100644 --- a/storage/innobase/include/sync0rw.h +++ b/storage/innobase/include/sync0rw.h @@ -622,11 +622,12 @@ struct rw_lock_struct { 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 */ +#ifdef UNIV_DEBUG ulint magic_n; /*!< RW_LOCK_MAGIC_N */ -}; - /** Value of rw_lock_struct::magic_n */ #define RW_LOCK_MAGIC_N 22643 +#endif /* UNIV_DEBUG */ +}; #ifdef UNIV_SYNC_DEBUG /** The structure for storing debug info of an rw-lock */ |