mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'github/10.0-galera' into 10.1

Browse source 
Note: some tests fail, just as they failed before the merge!
This commit is contained in:
Sergei Golubchik 2015-12-22 10:32:33 +01:00
commit 7697bf0bd7
26 changed files with 382 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

18
storage/innobase/include/lock0lock.h
View file

@ -663,6 +663,16 @@ lock_get_type(
/*==========*/
const lock_t* lock); /*!< in: lock */
/*******************************************************************//**
Gets the trx of the lock. Non-inline version for using outside of the
lock module.
@return trx_t* */
UNIV_INTERN
trx_t*
lock_get_trx(
/*=========*/
const lock_t* lock); /*!< in: lock */
/*******************************************************************//**
Gets the id of the transaction owning a lock.
@return transaction id */
@ -991,6 +1001,14 @@ void
lock_cancel_waiting_and_release(
/*============================*/
lock_t* lock); /*!< in/out: waiting lock request */
/*******************************************************************//**
Get lock mode and table/index name
@return string containing lock info */
std::string
lock_get_info(
const lock_t*);
#endif /* WITH_WSREP */
#ifndef UNIV_NONINL
#include "lock0lock.ic"