diff options
Diffstat (limited to 'storage/innobase/include/lock0lock.h')
-rw-r--r-- | storage/innobase/include/lock0lock.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index d96ba0d9c7d..b211b24d7ff 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -612,7 +612,7 @@ Calculates the hash value of a page file address: used in inserting or searching for a lock in the hash table. @return hashed value */ UNIV_INLINE -ulint +unsigned lock_rec_hash( /*==========*/ ulint space, /*!< in: space */ @@ -960,15 +960,15 @@ lock_trx_alloc_locks(trx_t* trx); type_mode field in a lock */ /** Lock types */ /* @{ */ -#define LOCK_TABLE 16 /*!< table lock */ -#define LOCK_REC 32 /*!< record lock */ +#define LOCK_TABLE 16U /*!< table lock */ +#define LOCK_REC 32U /*!< record lock */ #define LOCK_TYPE_MASK 0xF0UL /*!< mask used to extract lock type from the type_mode field in a lock */ #if LOCK_MODE_MASK & LOCK_TYPE_MASK # error "LOCK_MODE_MASK & LOCK_TYPE_MASK" #endif -#define LOCK_WAIT 256 /*!< Waiting lock flag; when set, it +#define LOCK_WAIT 256U /*!< Waiting lock flag; when set, it means that the lock has not yet been granted, it is just waiting for its turn in the wait queue */ @@ -976,14 +976,14 @@ lock_trx_alloc_locks(trx_t* trx); #define LOCK_ORDINARY 0 /*!< this flag denotes an ordinary next-key lock in contrast to LOCK_GAP or LOCK_REC_NOT_GAP */ -#define LOCK_GAP 512 /*!< when this bit is set, it means that the +#define LOCK_GAP 512U /*!< when this bit is set, it means that the lock holds only on the gap before the record; for instance, an x-lock on the gap does not give permission to modify the record on which the bit is set; locks of this type are created when records are removed from the index chain of records */ -#define LOCK_REC_NOT_GAP 1024 /*!< this bit means that the lock is only on +#define LOCK_REC_NOT_GAP 1024U /*!< this bit means that the lock is only on the index record and does NOT block inserts to the gap before the index record; this is used in the case when we retrieve a record @@ -991,7 +991,7 @@ lock_trx_alloc_locks(trx_t* trx); locking plain SELECTs (not part of UPDATE or DELETE) when the user has set the READ COMMITTED isolation level */ -#define LOCK_INSERT_INTENTION 2048 /*!< this bit is set when we place a waiting +#define LOCK_INSERT_INTENTION 2048U/*!< this bit is set when we place a waiting gap type record lock request in order to let an insert of an index record to wait until there are no conflicting locks by other @@ -999,8 +999,8 @@ lock_trx_alloc_locks(trx_t* trx); remains set when the waiting lock is granted, or if the lock is inherited to a neighboring record */ -#define LOCK_PREDICATE 8192 /*!< Predicate lock */ -#define LOCK_PRDT_PAGE 16384 /*!< Page lock */ +#define LOCK_PREDICATE 8192U /*!< Predicate lock */ +#define LOCK_PRDT_PAGE 16384U /*!< Page lock */ #if (LOCK_WAIT|LOCK_GAP|LOCK_REC_NOT_GAP|LOCK_INSERT_INTENTION|LOCK_PREDICATE|LOCK_PRDT_PAGE)&LOCK_MODE_MASK |