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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
83d0e72b
Commit
83d0e72b
authored
Jun 01, 2020
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup: Remove thr_is_recv(), trx_is_recv()
Compare to trx_roll_crash_recv_trx directly where needed.
parent
c50b7bee
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
51 deletions
+7
-51
storage/innobase/btr/btr0cur.cc
storage/innobase/btr/btr0cur.cc
+1
-1
storage/innobase/include/que0que.h
storage/innobase/include/que0que.h
+1
-11
storage/innobase/include/que0que.ic
storage/innobase/include/que0que.ic
+1
-14
storage/innobase/include/trx0roll.h
storage/innobase/include/trx0roll.h
+1
-10
storage/innobase/row/row0umod.cc
storage/innobase/row/row0umod.cc
+1
-1
storage/innobase/row/row0upd.cc
storage/innobase/row/row0upd.cc
+2
-1
storage/innobase/trx/trx0roll.cc
storage/innobase/trx/trx0roll.cc
+0
-13
No files found.
storage/innobase/btr/btr0cur.cc
View file @
83d0e72b
...
...
@@ -3998,7 +3998,7 @@ btr_cur_optimistic_update(
ULINT_UNDEFINED
,
heap
);
#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG
ut_a
(
!
rec_offs_any_null_extern
(
rec
,
*
offsets
)
||
t
rx_is_recv
(
thr_get_trx
(
thr
))
);
||
t
hr_get_trx
(
thr
)
==
trx_roll_crash_recv_trx
);
#endif
/* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */
if
(
!
row_upd_changes_field_size_or_external
(
index
,
*
offsets
,
update
))
{
...
...
storage/innobase/include/que0que.h
View file @
83d0e72b
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 20
19
, MariaDB Corporation.
Copyright (c) 2017, 20
20
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
...
...
@@ -169,16 +169,6 @@ trx_t*
thr_get_trx
(
/*========*/
que_thr_t
*
thr
);
/*!< in: query thread */
/*******************************************************************//**
Determines if this thread is rolling back an incomplete transaction
in crash recovery.
@return TRUE if thr is rolling back an incomplete transaction in crash
recovery */
UNIV_INLINE
ibool
thr_is_recv
(
/*========*/
const
que_thr_t
*
thr
);
/*!< in: query thread */
/***********************************************************************//**
Gets the type of a graph node. */
UNIV_INLINE
...
...
storage/innobase/include/que0que.ic
View file @
83d0e72b
/*****************************************************************************
Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
...
...
@@ -36,20 +37,6 @@ thr_get_trx(
return(thr->graph->trx);
}
/*******************************************************************//**
Determines if this thread is rolling back an incomplete transaction
in crash recovery.
@return TRUE if thr is rolling back an incomplete transaction in crash
recovery */
UNIV_INLINE
ibool
thr_is_recv(
/*========*/
const que_thr_t* thr) /*!< in: query thread */
{
return(trx_is_recv(thr->graph->trx));
}
/***********************************************************************//**
Gets the first thr in a fork. */
UNIV_INLINE
...
...
storage/innobase/include/trx0roll.h
View file @
83d0e72b
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 20
19
, MariaDB Corporation.
Copyright (c) 2015, 20
20
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
...
...
@@ -34,15 +34,6 @@ Created 3/26/1996 Heikki Tuuri
extern
bool
trx_rollback_or_clean_is_active
;
extern
const
trx_t
*
trx_roll_crash_recv_trx
;
/*******************************************************************//**
Determines if this transaction is rolling back an incomplete transaction
in crash recovery.
@return TRUE if trx is an incomplete transaction that is being rolled
back in crash recovery */
ibool
trx_is_recv
(
/*========*/
const
trx_t
*
trx
);
/*!< in: transaction */
/*******************************************************************//**
Returns a transaction savepoint taken at this point in time.
@return savepoint */
...
...
storage/innobase/row/row0umod.cc
View file @
83d0e72b
...
...
@@ -884,7 +884,7 @@ row_undo_mod_upd_del_sec(
does not exist. However, this situation may
only occur during the rollback of incomplete
transactions. */
ut_a
(
thr_
is_recv
(
thr
)
);
ut_a
(
thr_
get_trx
(
thr
)
==
trx_roll_crash_recv_trx
);
}
else
{
err
=
row_undo_mod_del_mark_or_remove_sec
(
node
,
thr
,
index
,
entry
);
...
...
storage/innobase/row/row0upd.cc
View file @
83d0e72b
...
...
@@ -1882,7 +1882,8 @@ row_upd_changes_ord_field_binary_func(
when the server had crashed before
storing the field. */
ut_ad
(
thr
->
graph
->
trx
->
is_recovered
);
ut_ad
(
trx_is_recv
(
thr
->
graph
->
trx
));
ut_ad
(
thr
->
graph
->
trx
==
trx_roll_crash_recv_trx
);
return
(
TRUE
);
}
...
...
storage/innobase/trx/trx0roll.cc
View file @
83d0e72b
...
...
@@ -551,19 +551,6 @@ trx_release_savepoint_for_mysql(
return
(
savep
!=
NULL
?
DB_SUCCESS
:
DB_NO_SAVEPOINT
);
}
/*******************************************************************//**
Determines if this transaction is rolling back an incomplete transaction
in crash recovery.
@return TRUE if trx is an incomplete transaction that is being rolled
back in crash recovery */
ibool
trx_is_recv
(
/*========*/
const
trx_t
*
trx
)
/*!< in: transaction */
{
return
(
trx
==
trx_roll_crash_recv_trx
);
}
/*******************************************************************//**
Returns a transaction savepoint taken at this point in time.
@return savepoint */
...
...
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