Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
56f50a65
Commit
56f50a65
authored
May 31, 2006
by
osku
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trx_sig_send() always succeeds or asserts, so remove return value and adjust
callers.
parent
c0abd9e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
33 deletions
+7
-33
include/trx0trx.h
include/trx0trx.h
+1
-3
trx/trx0roll.c
trx/trx0roll.c
+2
-9
trx/trx0trx.c
trx/trx0trx.c
+4
-21
No files found.
include/trx0trx.h
View file @
56f50a65
...
@@ -266,11 +266,9 @@ trx_end_lock_wait(
...
@@ -266,11 +266,9 @@ trx_end_lock_wait(
/********************************************************************
/********************************************************************
Sends a signal to a trx object. */
Sends a signal to a trx object. */
ibool
void
trx_sig_send
(
trx_sig_send
(
/*=========*/
/*=========*/
/* out: TRUE if the signal was
successfully delivered */
trx_t
*
trx
,
/* in: trx handle */
trx_t
*
trx
,
/* in: trx handle */
ulint
type
,
/* in: signal type */
ulint
type
,
/* in: signal type */
ulint
sender
,
/* in: TRX_SIG_SELF or
ulint
sender
,
/* in: TRX_SIG_SELF or
...
...
trx/trx0roll.c
View file @
56f50a65
...
@@ -1286,7 +1286,6 @@ trx_rollback_step(
...
@@ -1286,7 +1286,6 @@ trx_rollback_step(
que_thr_t
*
thr
)
/* in: query thread */
que_thr_t
*
thr
)
/* in: query thread */
{
{
roll_node_t
*
node
;
roll_node_t
*
node
;
ibool
success
;
ulint
sig_no
;
ulint
sig_no
;
trx_savept_t
*
savept
;
trx_savept_t
*
savept
;
...
@@ -1313,19 +1312,13 @@ trx_rollback_step(
...
@@ -1313,19 +1312,13 @@ trx_rollback_step(
/* Send a rollback signal to the transaction */
/* Send a rollback signal to the transaction */
success
=
trx_sig_send
(
thr_get_trx
(
thr
),
trx_sig_send
(
thr_get_trx
(
thr
),
sig_no
,
TRX_SIG_SELF
,
thr
,
sig_no
,
TRX_SIG_SELF
,
savept
,
NULL
);
thr
,
savept
,
NULL
);
thr
->
state
=
QUE_THR_SIG_REPLY_WAIT
;
thr
->
state
=
QUE_THR_SIG_REPLY_WAIT
;
mutex_exit
(
&
kernel_mutex
);
mutex_exit
(
&
kernel_mutex
);
if
(
!
success
)
{
/* Error in delivering the rollback signal */
que_thr_handle_error
(
thr
,
DB_ERROR
,
NULL
,
0
);
}
return
(
NULL
);
return
(
NULL
);
}
}
...
...
trx/trx0trx.c
View file @
56f50a65
...
@@ -1223,11 +1223,9 @@ trx_sig_is_compatible(
...
@@ -1223,11 +1223,9 @@ trx_sig_is_compatible(
/********************************************************************
/********************************************************************
Sends a signal to a trx object. */
Sends a signal to a trx object. */
ibool
void
trx_sig_send
(
trx_sig_send
(
/*=========*/
/*=========*/
/* out: TRUE if the signal was
successfully delivered */
trx_t
*
trx
,
/* in: trx handle */
trx_t
*
trx
,
/* in: trx handle */
ulint
type
,
/* in: signal type */
ulint
type
,
/* in: signal type */
ulint
sender
,
/* in: TRX_SIG_SELF or
ulint
sender
,
/* in: TRX_SIG_SELF or
...
@@ -1254,11 +1252,9 @@ trx_sig_send(
...
@@ -1254,11 +1252,9 @@ trx_sig_send(
if
(
!
trx_sig_is_compatible
(
trx
,
type
,
sender
))
{
if
(
!
trx_sig_is_compatible
(
trx
,
type
,
sender
))
{
/* The signal is not compatible with the other signals in
/* The signal is not compatible with the other signals in
the queue: d
o nothing
*/
the queue: d
ie
*/
ut_error
;
ut_error
;
return
(
FALSE
);
}
}
/* Queue the signal object */
/* Queue the signal object */
...
@@ -1299,11 +1295,6 @@ trx_sig_send(
...
@@ -1299,11 +1295,6 @@ trx_sig_send(
}
}
if
((
sender
!=
TRX_SIG_SELF
)
||
(
type
==
TRX_SIG_BREAK_EXECUTION
))
{
if
((
sender
!=
TRX_SIG_SELF
)
||
(
type
==
TRX_SIG_BREAK_EXECUTION
))
{
/* The following call will add a TRX_SIG_ERROR_OCCURRED
signal to the end of the queue, if the session is not yet
in the error state: */
ut_error
;
ut_error
;
}
}
...
@@ -1314,8 +1305,6 @@ trx_sig_send(
...
@@ -1314,8 +1305,6 @@ trx_sig_send(
trx_sig_start_handle
(
trx
,
next_thr
);
trx_sig_start_handle
(
trx
,
next_thr
);
}
}
return
(
TRUE
);
}
}
/********************************************************************
/********************************************************************
...
@@ -1541,7 +1530,6 @@ trx_commit_step(
...
@@ -1541,7 +1530,6 @@ trx_commit_step(
{
{
commit_node_t
*
node
;
commit_node_t
*
node
;
que_thr_t
*
next_thr
;
que_thr_t
*
next_thr
;
ibool
success
;
node
=
thr
->
run_node
;
node
=
thr
->
run_node
;
...
@@ -1562,16 +1550,11 @@ trx_commit_step(
...
@@ -1562,16 +1550,11 @@ trx_commit_step(
/* Send the commit signal to the transaction */
/* Send the commit signal to the transaction */
success
=
trx_sig_send
(
thr_get_trx
(
thr
),
TRX_SIG_COMMIT
,
trx_sig_send
(
thr_get_trx
(
thr
),
TRX_SIG_COMMIT
,
TRX_SIG_SELF
,
TRX_SIG_SELF
,
thr
,
NULL
,
&
next_thr
);
thr
,
NULL
,
&
next_thr
);
mutex_exit
(
&
kernel_mutex
);
mutex_exit
(
&
kernel_mutex
);
if
(
!
success
)
{
/* Error in delivering the commit signal */
que_thr_handle_error
(
thr
,
DB_ERROR
,
NULL
,
0
);
}
return
(
next_thr
);
return
(
next_thr
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment