diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-15 14:54:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-15 14:54:23 +0200 |
| commit | 37f5632212fd5cf6aafa272d33ca34da2320d570 (patch) | |
| tree | 792f1e903f969bf293cc2ba8a272df705cf05dc0 /storage/xtradb/include/sync0sync.h | |
| parent | 13982b5a118ab9060d786da646af94d81638bc3b (diff) | |
| parent | 6de579241ed0bf01dfad1a7cede9fde36a1c5c03 (diff) | |
| download | mariadb-git-37f5632212fd5cf6aafa272d33ca34da2320d570.tar.gz | |
merged with XtraDB 1.1.8-26.0
Diffstat (limited to 'storage/xtradb/include/sync0sync.h')
| -rw-r--r-- | storage/xtradb/include/sync0sync.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/xtradb/include/sync0sync.h b/storage/xtradb/include/sync0sync.h index f9434ed54be..4a2f55d90ff 100644 --- a/storage/xtradb/include/sync0sync.h +++ b/storage/xtradb/include/sync0sync.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2011, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -18,8 +18,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., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -404,8 +404,10 @@ void sync_thread_add_level( /*==================*/ void* latch, /*!< in: pointer to a mutex or an rw-lock */ - ulint level); /*!< in: level in the latching order; if + ulint level, /*!< in: level in the latching order; if SYNC_LEVEL_VARYING, nothing is done */ + ibool relock) /*!< in: TRUE if re-entering an x-lock */ + __attribute__((nonnull)); /******************************************************************//** Removes a latch from the thread level array if it is found there. @return TRUE if found in the array; it is no error if the latch is |