diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:01:13 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:01:13 +0300 |
| commit | 0a9216835f406947fb4d492616da4cda75e5e113 (patch) | |
| tree | 7fbf5059c59fa86ca255452f3ce312aece492652 /storage/xtradb/include/srv0srv.h | |
| parent | 58926b5e1990d3245b55081ba511fbabe2604e17 (diff) | |
| download | mariadb-git-0a9216835f406947fb4d492616da4cda75e5e113.tar.gz | |
Initial merge result with mariaDB 10: lp:maria
Diffstat (limited to 'storage/xtradb/include/srv0srv.h')
| -rw-r--r-- | storage/xtradb/include/srv0srv.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h index 586c1e73879..17b32dff3be 100644 --- a/storage/xtradb/include/srv0srv.h +++ b/storage/xtradb/include/srv0srv.h @@ -166,6 +166,10 @@ extern ulint srv_log_buffer_size; extern char srv_use_global_flush_log_at_trx_commit; extern char srv_adaptive_flushing; +#ifdef WITH_INNODB_DISALLOW_WRITES +/* When this event is reset we do not allow any file writes to take place. */ +extern os_event_t srv_allow_writes_event; +#endif /* WITH_INNODB_DISALLOW_WRITES */ /* If this flag is TRUE, then we will load the indexes' (and tables') metadata even if they are marked as "corrupted". Mostly it is for DBA to process corrupted index and table */ @@ -643,6 +647,14 @@ srv_conc_enter_innodb( /*==================*/ trx_t* trx); /*!< in: transaction object associated with the thread */ +#ifdef WITH_WSREP +UNIV_INTERN +void +wsrep_srv_conc_cancel_wait( +/*==================*/ + trx_t* trx); /*!< in: transaction object associated with the + thread */ +#endif /* WITH_WSREP */ /*********************************************************************//** 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. */ |