mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Many files:
Merge InnoDB-.48 sql/ha_innobase.cc: Merge InnoDB-.48 innobase/include/dict0dict.h: Merge InnoDB-.48 innobase/include/dict0mem.h: Merge InnoDB-.48 innobase/include/mem0dbg.h: Merge InnoDB-.48 innobase/include/mem0mem.h: Merge InnoDB-.48 innobase/include/que0que.h: Merge InnoDB-.48 innobase/include/row0mysql.h: Merge InnoDB-.48 innobase/include/srv0srv.h: Merge InnoDB-.48 innobase/include/trx0sys.h: Merge InnoDB-.48 innobase/include/trx0trx.h: Merge InnoDB-.48 innobase/include/mem0mem.ic: Merge InnoDB-.48 innobase/dict/dict0dict.c: Merge InnoDB-.48 innobase/dict/dict0mem.c: Merge InnoDB-.48 innobase/log/log0recv.c: Merge InnoDB-.48 innobase/mem/mem0dbg.c: Merge InnoDB-.48 innobase/mem/mem0mem.c: Merge InnoDB-.48 innobase/pars/lexyy.c: Merge InnoDB-.48 innobase/que/que0que.c: Merge InnoDB-.48 innobase/rem/rem0rec.c: Merge InnoDB-.48 innobase/row/row0mysql.c: Merge InnoDB-.48 innobase/row/row0sel.c: Merge InnoDB-.48 innobase/srv/srv0srv.c: Merge InnoDB-.48 innobase/sync/sync0arr.c: Merge InnoDB-.48 innobase/trx/trx0sys.c: Merge InnoDB-.48 innobase/trx/trx0trx.c: Merge InnoDB-.48 innobase/trx/trx0undo.c: Merge InnoDB-.48
This commit is contained in:
@ -17,6 +17,8 @@ Created 10/10/1995 Heikki Tuuri
|
||||
#include "que0types.h"
|
||||
#include "trx0types.h"
|
||||
|
||||
/* Buffer which can be used in printing fatal error messages */
|
||||
extern char srv_fatal_errbuf[];
|
||||
|
||||
/* When this event is set the lock timeout and InnoDB monitor
|
||||
thread starts running */
|
||||
@ -261,15 +263,27 @@ This lets a thread enter InnoDB regardless of the number of threads inside
|
||||
InnoDB. This must be called when a thread ends a lock wait. */
|
||||
|
||||
void
|
||||
srv_conc_force_enter_innodb(void);
|
||||
/*=============================*/
|
||||
srv_conc_force_enter_innodb(
|
||||
/*========================*/
|
||||
trx_t* trx); /* in: transaction object associated with the
|
||||
thread */
|
||||
/*************************************************************************
|
||||
This must be called when a thread exits InnoDB. This must also be called
|
||||
when a thread goes to wait for a lock. */
|
||||
This must be called when a thread exits InnoDB in a lock wait or at the
|
||||
end of an SQL statement. */
|
||||
|
||||
void
|
||||
srv_conc_exit_innodb(void);
|
||||
/*======================*/
|
||||
srv_conc_force_exit_innodb(
|
||||
/*=======================*/
|
||||
trx_t* trx); /* in: transaction object associated with the
|
||||
thread */
|
||||
/*************************************************************************
|
||||
This must be called when a thread exits InnoDB. */
|
||||
|
||||
void
|
||||
srv_conc_exit_innodb(
|
||||
/*=================*/
|
||||
trx_t* trx); /* in: transaction object associated with the
|
||||
thread */
|
||||
/*******************************************************************
|
||||
Puts a MySQL OS thread to wait for a lock to be released. */
|
||||
|
||||
|
Reference in New Issue
Block a user