diff options
Diffstat (limited to 'storage/xtradb/include/lock0priv.h')
| -rw-r--r-- | storage/xtradb/include/lock0priv.h | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/storage/xtradb/include/lock0priv.h b/storage/xtradb/include/lock0priv.h index 491cad95329..e564387ec53 100644 --- a/storage/xtradb/include/lock0priv.h +++ b/storage/xtradb/include/lock0priv.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2007, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 2007, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -40,9 +40,7 @@ those functions in lock/ */ #include "ut0lst.h" /** A table lock */ -typedef struct lock_table_struct lock_table_t; -/** A table lock */ -struct lock_table_struct { +struct lock_table_t { dict_table_t* table; /*!< database table in dictionary cache */ UT_LIST_NODE_T(lock_t) @@ -51,9 +49,7 @@ struct lock_table_struct { }; /** Record lock for a page */ -typedef struct lock_rec_struct lock_rec_t; -/** Record lock for a page */ -struct lock_rec_struct { +struct lock_rec_t { ulint space; /*!< space id */ ulint page_no; /*!< page number */ ulint n_bits; /*!< number of bits in the lock @@ -62,8 +58,8 @@ struct lock_rec_struct { lock struct */ }; -/** Lock struct */ -struct lock_struct { +/** Lock struct; protected by lock_sys->mutex */ +struct lock_t { trx_t* trx; /*!< transaction owning the lock */ UT_LIST_NODE_T(lock_t) @@ -101,6 +97,19 @@ lock_rec_get_prev( const lock_t* in_lock,/*!< in: record lock */ ulint heap_no);/*!< in: heap number of the record */ +/*********************************************************************//** +Checks if some transaction has an implicit x-lock on a record in a clustered +index. +@return transaction id of the transaction which has the x-lock, or 0 */ +UNIV_INLINE +trx_id_t +lock_clust_rec_some_has_impl( +/*=========================*/ + const rec_t* rec, /*!< in: user record */ + const dict_index_t* index, /*!< in: clustered index */ + const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */ + __attribute__((nonnull, warn_unused_result)); + #ifndef UNIV_NONINL #include "lock0priv.ic" #endif |