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
72e5d2ae
Commit
72e5d2ae
authored
Jun 21, 2010
by
Inaam Rana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes bug#39168.
Make a call to log_free_check() on all DML paths.
parent
23d05c1c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
63 additions
and
5 deletions
+63
-5
storage/innobase/include/log0log.ic
storage/innobase/include/log0log.ic
+4
-1
storage/innobase/row/row0ins.c
storage/innobase/row/row0ins.c
+9
-0
storage/innobase/row/row0purge.c
storage/innobase/row/row0purge.c
+11
-0
storage/innobase/row/row0uins.c
storage/innobase/row/row0uins.c
+12
-1
storage/innobase/row/row0umod.c
storage/innobase/row/row0umod.c
+13
-1
storage/innobase/row/row0upd.c
storage/innobase/row/row0upd.c
+14
-2
No files found.
storage/innobase/include/log0log.ic
View file @
72e5d2ae
...
@@ -433,7 +433,10 @@ void
...
@@ -433,7 +433,10 @@ void
log_free_check(void)
log_free_check(void)
/*================*/
/*================*/
{
{
/* ut_ad(sync_thread_levels_empty()); */
#ifdef UNIV_SYNC_DEBUG
ut_ad(sync_thread_levels_empty_gen(TRUE));
#endif /* UNIV_SYNC_DEBUG */
if (log_sys->check_flush_or_checkpoint) {
if (log_sys->check_flush_or_checkpoint) {
...
...
storage/innobase/row/row0ins.c
View file @
72e5d2ae
...
@@ -51,6 +51,15 @@ Created 4/20/1996 Heikki Tuuri
...
@@ -51,6 +51,15 @@ Created 4/20/1996 Heikki Tuuri
#define ROW_INS_PREV 1
#define ROW_INS_PREV 1
#define ROW_INS_NEXT 2
#define ROW_INS_NEXT 2
/*************************************************************************
IMPORTANT NOTE: Any operation that generates redo MUST check that there
is enough space in the redo log before for that operation. This is
done by calling log_free_check(). The reason for checking the
availability of the redo log space before the start of the operation is
that we MUST not hold any synchonization objects when performing the
check.
If you make a change in this module make sure that no codepath is
introduced where a call to log_free_check() is bypassed. */
/*********************************************************************//**
/*********************************************************************//**
Creates an insert node struct.
Creates an insert node struct.
...
...
storage/innobase/row/row0purge.c
View file @
72e5d2ae
...
@@ -44,6 +44,16 @@ Created 3/14/1997 Heikki Tuuri
...
@@ -44,6 +44,16 @@ Created 3/14/1997 Heikki Tuuri
#include "row0mysql.h"
#include "row0mysql.h"
#include "log0log.h"
#include "log0log.h"
/*************************************************************************
IMPORTANT NOTE: Any operation that generates redo MUST check that there
is enough space in the redo log before for that operation. This is
done by calling log_free_check(). The reason for checking the
availability of the redo log space before the start of the operation is
that we MUST not hold any synchonization objects when performing the
check.
If you make a change in this module make sure that no codepath is
introduced where a call to log_free_check() is bypassed. */
/********************************************************************//**
/********************************************************************//**
Creates a purge node to a query graph.
Creates a purge node to a query graph.
@return own: purge node */
@return own: purge node */
...
@@ -126,6 +136,7 @@ row_purge_remove_clust_if_poss_low(
...
@@ -126,6 +136,7 @@ row_purge_remove_clust_if_poss_low(
pcur
=
&
(
node
->
pcur
);
pcur
=
&
(
node
->
pcur
);
btr_cur
=
btr_pcur_get_btr_cur
(
pcur
);
btr_cur
=
btr_pcur_get_btr_cur
(
pcur
);
log_free_check
();
mtr_start
(
&
mtr
);
mtr_start
(
&
mtr
);
success
=
row_purge_reposition_pcur
(
mode
,
node
,
&
mtr
);
success
=
row_purge_reposition_pcur
(
mode
,
node
,
&
mtr
);
...
...
storage/innobase/row/row0uins.c
View file @
72e5d2ae
...
@@ -46,6 +46,16 @@ Created 2/25/1997 Heikki Tuuri
...
@@ -46,6 +46,16 @@ Created 2/25/1997 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "ibuf0ibuf.h"
#include "log0log.h"
#include "log0log.h"
/*************************************************************************
IMPORTANT NOTE: Any operation that generates redo MUST check that there
is enough space in the redo log before for that operation. This is
done by calling log_free_check(). The reason for checking the
availability of the redo log space before the start of the operation is
that we MUST not hold any synchonization objects when performing the
check.
If you make a change in this module make sure that no codepath is
introduced where a call to log_free_check() is bypassed. */
/***************************************************************//**
/***************************************************************//**
Removes a clustered index record. The pcur in node was positioned on the
Removes a clustered index record. The pcur in node was positioned on the
record, now it is detached.
record, now it is detached.
...
@@ -151,7 +161,6 @@ row_undo_ins_remove_sec_low(
...
@@ -151,7 +161,6 @@ row_undo_ins_remove_sec_low(
mtr_t
mtr
;
mtr_t
mtr
;
enum
row_search_result
search_result
;
enum
row_search_result
search_result
;
log_free_check
();
mtr_start
(
&
mtr
);
mtr_start
(
&
mtr
);
btr_cur
=
btr_pcur_get_btr_cur
(
&
pcur
);
btr_cur
=
btr_pcur_get_btr_cur
(
&
pcur
);
...
@@ -337,6 +346,7 @@ row_undo_ins(
...
@@ -337,6 +346,7 @@ row_undo_ins(
transactions. */
transactions. */
ut_a
(
trx_is_recv
(
node
->
trx
));
ut_a
(
trx_is_recv
(
node
->
trx
));
}
else
{
}
else
{
log_free_check
();
err
=
row_undo_ins_remove_sec
(
node
->
index
,
entry
);
err
=
row_undo_ins_remove_sec
(
node
->
index
,
entry
);
if
(
err
!=
DB_SUCCESS
)
{
if
(
err
!=
DB_SUCCESS
)
{
...
@@ -348,5 +358,6 @@ row_undo_ins(
...
@@ -348,5 +358,6 @@ row_undo_ins(
node
->
index
=
dict_table_get_next_index
(
node
->
index
);
node
->
index
=
dict_table_get_next_index
(
node
->
index
);
}
}
log_free_check
();
return
(
row_undo_ins_remove_clust_rec
(
node
));
return
(
row_undo_ins_remove_clust_rec
(
node
));
}
}
storage/innobase/row/row0umod.c
View file @
72e5d2ae
...
@@ -58,12 +58,22 @@ delete marked clustered index record was delete unmarked and possibly also
...
@@ -58,12 +58,22 @@ delete marked clustered index record was delete unmarked and possibly also
some of its fields were changed. Now, it is possible that the delete marked
some of its fields were changed. Now, it is possible that the delete marked
version has become obsolete at the time the undo is started. */
version has become obsolete at the time the undo is started. */
/*************************************************************************
IMPORTANT NOTE: Any operation that generates redo MUST check that there
is enough space in the redo log before for that operation. This is
done by calling log_free_check(). The reason for checking the
availability of the redo log space before the start of the operation is
that we MUST not hold any synchonization objects when performing the
check.
If you make a change in this module make sure that no codepath is
introduced where a call to log_free_check() is bypassed. */
/***********************************************************//**
/***********************************************************//**
Checks if also the previous version of the clustered index record was
Checks if also the previous version of the clustered index record was
modified or inserted by the same transaction, and its undo number is such
modified or inserted by the same transaction, and its undo number is such
that it should be undone in the same rollback.
that it should be undone in the same rollback.
@return TRUE if also previous modify or insert of this row should be undone */
@return TRUE if also previous modify or insert of this row should be undone */
UNIV_INLINE
static
ibool
ibool
row_undo_mod_undo_also_prev_vers
(
row_undo_mod_undo_also_prev_vers
(
/*=============================*/
/*=============================*/
...
@@ -231,6 +241,8 @@ row_undo_mod_clust(
...
@@ -231,6 +241,8 @@ row_undo_mod_clust(
ut_ad
(
node
&&
thr
);
ut_ad
(
node
&&
thr
);
log_free_check
();
/* Check if also the previous version of the clustered index record
/* Check if also the previous version of the clustered index record
should be undone in this same rollback operation */
should be undone in this same rollback operation */
...
...
storage/innobase/row/row0upd.c
View file @
72e5d2ae
...
@@ -92,6 +92,16 @@ the x-latch freed? The most efficient way for performing a
...
@@ -92,6 +92,16 @@ the x-latch freed? The most efficient way for performing a
searched delete is obviously to keep the x-latch for several
searched delete is obviously to keep the x-latch for several
steps of query graph execution. */
steps of query graph execution. */
/*************************************************************************
IMPORTANT NOTE: Any operation that generates redo MUST check that there
is enough space in the redo log before for that operation. This is
done by calling log_free_check(). The reason for checking the
availability of the redo log space before the start of the operation is
that we MUST not hold any synchonization objects when performing the
check.
If you make a change in this module make sure that no codepath is
introduced where a call to log_free_check() is bypassed. */
/***********************************************************//**
/***********************************************************//**
Checks if an update vector changes some of the first ordering fields of an
Checks if an update vector changes some of the first ordering fields of an
index record. This is only used in foreign key checks and we can assume
index record. This is only used in foreign key checks and we can assume
...
@@ -1454,7 +1464,6 @@ row_upd_sec_index_entry(
...
@@ -1454,7 +1464,6 @@ row_upd_sec_index_entry(
entry
=
row_build_index_entry
(
node
->
row
,
node
->
ext
,
index
,
heap
);
entry
=
row_build_index_entry
(
node
->
row
,
node
->
ext
,
index
,
heap
);
ut_a
(
entry
);
ut_a
(
entry
);
log_free_check
();
mtr_start
(
&
mtr
);
mtr_start
(
&
mtr
);
/* Set the query thread, so that ibuf_insert_low() will be
/* Set the query thread, so that ibuf_insert_low() will be
...
@@ -1557,7 +1566,7 @@ Updates the secondary index record if it is changed in the row update or
...
@@ -1557,7 +1566,7 @@ Updates the secondary index record if it is changed in the row update or
deletes it if this is a delete.
deletes it if this is a delete.
@return DB_SUCCESS if operation successfully completed, else error
@return DB_SUCCESS if operation successfully completed, else error
code or DB_LOCK_WAIT */
code or DB_LOCK_WAIT */
UNIV_INLINE
static
ulint
ulint
row_upd_sec_step
(
row_upd_sec_step
(
/*=============*/
/*=============*/
...
@@ -2049,6 +2058,7 @@ row_upd(
...
@@ -2049,6 +2058,7 @@ row_upd(
if
(
node
->
state
==
UPD_NODE_UPDATE_CLUSTERED
if
(
node
->
state
==
UPD_NODE_UPDATE_CLUSTERED
||
node
->
state
==
UPD_NODE_INSERT_CLUSTERED
)
{
||
node
->
state
==
UPD_NODE_INSERT_CLUSTERED
)
{
log_free_check
();
err
=
row_upd_clust_step
(
node
,
thr
);
err
=
row_upd_clust_step
(
node
,
thr
);
if
(
err
!=
DB_SUCCESS
)
{
if
(
err
!=
DB_SUCCESS
)
{
...
@@ -2063,6 +2073,8 @@ row_upd(
...
@@ -2063,6 +2073,8 @@ row_upd(
}
}
while
(
node
->
index
!=
NULL
)
{
while
(
node
->
index
!=
NULL
)
{
log_free_check
();
err
=
row_upd_sec_step
(
node
,
thr
);
err
=
row_upd_sec_step
(
node
,
thr
);
if
(
err
!=
DB_SUCCESS
)
{
if
(
err
!=
DB_SUCCESS
)
{
...
...
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