summaryrefslogtreecommitdiff
path: root/innobase/include/trx0roll.h
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-05-25 20:12:09 +0300
committerunknown <marko@hundin.mysql.fi>2004-05-25 20:12:09 +0300
commitb2882fd4f5401fdc9a1aab57de758848e9831f2e (patch)
treeec8991c7d93cafeed85b8b602f32fb9fcf134900 /innobase/include/trx0roll.h
parent137af9003dc23bfdab76d64d114ad81dda7682ae (diff)
downloadmariadb-git-b2882fd4f5401fdc9a1aab57de758848e9831f2e.tar.gz
InnoDB cleanup and possible bug-fix: Remove srv0que
BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96: Delete: innobase/srv/srv0que.c innobase/srv/Makefile.am: Remove srv0que.c BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e: Delete: innobase/include/srv0que.h innobase/include/Makefile.am: Remove srv0que.c innobase/include/que0que.h: Remove unnecessary function que_fork_error_handle() que_thr_end_wait(): Remove output parameter next_thr; return it innobase/include/trx0roll.h: trx_rollback(), trx_finish_rollback_off_kernel(): Remove output parameter next_thr; return it instead innobase/include/trx0trx.h: trx_sig_send(), trx_sig_reply(), trx_sig_start_handle(): Remove output parameter next_thr; return it instead innobase/include/usr0sess.h: Remove sess->state and its literals SESS_ACTIVE and SESS_ERROR innobase/que/que0que.c: Remove unnecessary function que_fork_error_handle() que_thr_end_wait(): Remove output parameter next_thr; return it Remove references to srv0que.c innobase/srv/srv0srv.c: Remove unnecessary #include "srv0que.h" innobase/trx/trx0purge.c: Remove unneeded references to srv0que.c innobase/trx/trx0roll.c: Many functions: Remove output parameter next_thr; return it instead Remove references to srv0que.c innobase/trx/trx0trx.c: Many functions: Remove output parameter next_thr; return it instead Remove references to srv0que.c Remove references to SESS_ERROR innobase/usr/usr0sess.c: Remove sess->state
Diffstat (limited to 'innobase/include/trx0roll.h')
-rw-r--r--innobase/include/trx0roll.h21
1 files changed, 6 insertions, 15 deletions
diff --git a/innobase/include/trx0roll.h b/innobase/include/trx0roll.h
index 0d7126c9c57..e9c74dc6651 100644
--- a/innobase/include/trx0roll.h
+++ b/innobase/include/trx0roll.h
@@ -91,16 +91,12 @@ trx_undo_rec_release(
/*************************************************************************
Starts a rollback operation. */
-void
+que_thr_t*
trx_rollback(
/*=========*/
+ /* out: next query thread to run */
trx_t* trx, /* in: transaction */
- trx_sig_t* sig, /* in: signal starting the rollback */
- que_thr_t** next_thr);/* in/out: next query thread to run;
- if the value which is passed in is
- a pointer to a NULL pointer, then the
- calling function can start running
- a new query thread */
+ trx_sig_t* sig); /* in: signal starting the rollback */
/***********************************************************************
Rollback or clean up transactions which have no user session. If the
transaction already was committed, then we clean up a possible insert
@@ -112,17 +108,12 @@ trx_rollback_or_clean_all_without_sess(void);
/********************************************************************
Finishes a transaction rollback. */
-void
+que_thr_t*
trx_finish_rollback_off_kernel(
/*===========================*/
+ /* out: next query thread to run */
que_t* graph, /* in: undo graph which can now be freed */
- trx_t* trx, /* in: transaction */
- que_thr_t** next_thr);/* in/out: next query thread to run;
- if the value which is passed in is
- a pointer to a NULL pointer, then the
- calling function can start running
- a new query thread; if this parameter is
- NULL, it is ignored */
+ trx_t* trx); /* in: transaction */
/********************************************************************
Builds an undo 'query' graph for a transaction. The actual rollback is
performed by executing this query graph like a query subprocedure call.