diff options
author | unknown <marko@hundin.mysql.fi> | 2004-05-25 20:12:09 +0300 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2004-05-25 20:12:09 +0300 |
commit | 8983aac428496bf4ed1b9dcc9e323a4a0905bc1a (patch) | |
tree | ec8991c7d93cafeed85b8b602f32fb9fcf134900 /innobase/include/que0que.h | |
parent | dd62a2edfa8f3ebda89ee3d95d227e05c0d44e26 (diff) | |
download | mariadb-git-8983aac428496bf4ed1b9dcc9e323a4a0905bc1a.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/que0que.h')
-rw-r--r-- | innobase/include/que0que.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/innobase/include/que0que.h b/innobase/include/que0que.h index bcd7aed7e88..a438116781f 100644 --- a/innobase/include/que0que.h +++ b/innobase/include/que0que.h @@ -152,17 +152,6 @@ que_run_threads( /*============*/ que_thr_t* thr); /* in: query thread which is run initially */ /************************************************************************** -After signal handling is finished, returns control to a query graph error -handling routine. (Currently, just returns the control to the root of the -graph so that the graph can communicate an error message to the client.) */ - -void -que_fork_error_handle( -/*==================*/ - trx_t* trx, /* in: trx */ - que_t* fork); /* in: query graph which was run before signal - handling started, NULL not allowed */ -/************************************************************************** Handles an SQL error noticed during query thread execution. At the moment, does nothing! */ @@ -181,18 +170,15 @@ a single worker thread to execute it. This function should be used to end the wait state of a query thread waiting for a lock or a stored procedure completion. */ -void +que_thr_t* que_thr_end_wait( /*=============*/ - que_thr_t* thr, /* in: query thread in the + /* out: next query thread to run; + NULL if none */ + que_thr_t* thr); /* in: query thread in the QUE_THR_LOCK_WAIT, or QUE_THR_PROCEDURE_WAIT, or QUE_THR_SIG_REPLY_WAIT state */ - 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 */ /************************************************************************** Same as que_thr_end_wait, but no parameter next_thr available. */ |