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
39f21868
Commit
39f21868
authored
Feb 16, 2012
by
Kent Boortz
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
1932a623
05172fb9
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
52 additions
and
14 deletions
+52
-14
storage/innobase/row/row0ins.c
storage/innobase/row/row0ins.c
+11
-0
storage/innobase/row/row0upd.c
storage/innobase/row/row0upd.c
+9
-1
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.cc
+2
-2
storage/innodb_plugin/include/log0log.h
storage/innodb_plugin/include/log0log.h
+3
-3
storage/innodb_plugin/include/mtr0mtr.h
storage/innodb_plugin/include/mtr0mtr.h
+2
-2
storage/innodb_plugin/log/log0log.c
storage/innodb_plugin/log/log0log.c
+3
-3
storage/innodb_plugin/mtr/mtr0mtr.c
storage/innodb_plugin/mtr/mtr0mtr.c
+2
-2
storage/innodb_plugin/row/row0ins.c
storage/innodb_plugin/row/row0ins.c
+11
-0
storage/innodb_plugin/row/row0upd.c
storage/innodb_plugin/row/row0upd.c
+9
-1
No files found.
storage/innobase/row/row0ins.c
View file @
39f21868
...
@@ -6,6 +6,9 @@ Insert into a table
...
@@ -6,6 +6,9 @@ Insert into a table
Created 4/20/1996 Heikki Tuuri
Created 4/20/1996 Heikki Tuuri
*******************************************************/
*******************************************************/
#include "my_global.h"
/* HAVE_* */
#include "m_string.h"
/* for my_sys.h */
#include "my_sys.h"
/* DEBUG_SYNC_C */
#include "row0ins.h"
#include "row0ins.h"
#ifdef UNIV_NONINL
#ifdef UNIV_NONINL
...
@@ -2121,16 +2124,24 @@ row_ins_index_entry_low(
...
@@ -2121,16 +2124,24 @@ row_ins_index_entry_low(
if
(
big_rec
)
{
if
(
big_rec
)
{
rec_t
*
rec
;
rec_t
*
rec
;
DBUG_EXECUTE_IF
(
"row_ins_extern_checkpoint"
,
log_make_checkpoint_at
(
ut_dulint_max
,
TRUE
););
mtr_start
(
&
mtr
);
mtr_start
(
&
mtr
);
DEBUG_SYNC_C
(
"before_row_ins_extern_latch"
);
btr_cur_search_to_nth_level
(
index
,
0
,
entry
,
PAGE_CUR_LE
,
btr_cur_search_to_nth_level
(
index
,
0
,
entry
,
PAGE_CUR_LE
,
BTR_MODIFY_TREE
,
&
cursor
,
0
,
&
mtr
);
BTR_MODIFY_TREE
,
&
cursor
,
0
,
&
mtr
);
rec
=
btr_cur_get_rec
(
&
cursor
);
rec
=
btr_cur_get_rec
(
&
cursor
);
offsets
=
rec_get_offsets
(
rec
,
index
,
offsets
,
offsets
=
rec_get_offsets
(
rec
,
index
,
offsets
,
ULINT_UNDEFINED
,
&
heap
);
ULINT_UNDEFINED
,
&
heap
);
DEBUG_SYNC_C
(
"before_row_ins_upd_extern"
);
err
=
btr_store_big_rec_extern_fields
(
index
,
rec
,
err
=
btr_store_big_rec_extern_fields
(
index
,
rec
,
offsets
,
big_rec
,
&
mtr
);
offsets
,
big_rec
,
&
mtr
);
DEBUG_SYNC_C
(
"after_row_ins_upd_extern"
);
if
(
modify
)
{
if
(
modify
)
{
dtuple_big_rec_free
(
big_rec
);
dtuple_big_rec_free
(
big_rec
);
...
...
storage/innobase/row/row0upd.c
View file @
39f21868
...
@@ -6,6 +6,9 @@ Update of a row
...
@@ -6,6 +6,9 @@ Update of a row
Created 12/27/1996 Heikki Tuuri
Created 12/27/1996 Heikki Tuuri
*******************************************************/
*******************************************************/
#include "my_global.h"
/* HAVE_* */
#include "m_string.h"
/* for my_sys.h */
#include "my_sys.h"
/* DEBUG_SYNC_C */
#include "row0upd.h"
#include "row0upd.h"
#ifdef UNIV_NONINL
#ifdef UNIV_NONINL
...
@@ -1591,15 +1594,20 @@ row_upd_clust_rec(
...
@@ -1591,15 +1594,20 @@ row_upd_clust_rec(
rec_t
*
rec
;
rec_t
*
rec
;
*
offsets_
=
(
sizeof
offsets_
)
/
sizeof
*
offsets_
;
*
offsets_
=
(
sizeof
offsets_
)
/
sizeof
*
offsets_
;
mtr_start
(
mtr
);
DBUG_EXECUTE_IF
(
"row_upd_extern_checkpoint"
,
log_make_checkpoint_at
(
ut_dulint_max
,
TRUE
););
mtr_start
(
mtr
);
ut_a
(
btr_pcur_restore_position
(
BTR_MODIFY_TREE
,
pcur
,
mtr
));
ut_a
(
btr_pcur_restore_position
(
BTR_MODIFY_TREE
,
pcur
,
mtr
));
rec
=
btr_cur_get_rec
(
btr_cur
);
rec
=
btr_cur_get_rec
(
btr_cur
);
DEBUG_SYNC_C
(
"before_row_upd_extern"
);
err
=
btr_store_big_rec_extern_fields
(
err
=
btr_store_big_rec_extern_fields
(
index
,
rec
,
index
,
rec
,
rec_get_offsets
(
rec
,
index
,
offsets_
,
rec_get_offsets
(
rec
,
index
,
offsets_
,
ULINT_UNDEFINED
,
&
heap
),
ULINT_UNDEFINED
,
&
heap
),
big_rec
,
mtr
);
big_rec
,
mtr
);
DEBUG_SYNC_C
(
"after_row_upd_extern"
);
if
(
UNIV_LIKELY_NULL
(
heap
))
{
if
(
UNIV_LIKELY_NULL
(
heap
))
{
mem_heap_free
(
heap
);
mem_heap_free
(
heap
);
}
}
...
...
storage/innodb_plugin/handler/ha_innodb.cc
View file @
39f21868
...
@@ -26,8 +26,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
...
@@ -26,8 +26,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
59 Temple
this program; if not, write to the Free Software Foundation, Inc.,
Place, Suite 330, Boston, MA 02111-1307
USA
51 Franklin Street, Suite 500, Boston, MA 02110-1335
USA
*****************************************************************************/
*****************************************************************************/
...
...
storage/innodb_plugin/include/log0log.h
View file @
39f21868
/*****************************************************************************
/*****************************************************************************
Copyright (c) 1995, 2010,
Innobase Oy
. All Rights Reserved.
Copyright (c) 1995, 2010,
Oracle and/or its affiliates
. All Rights Reserved.
Copyright (c) 2009, Google Inc.
Copyright (c) 2009, Google Inc.
Portions of this file contain modifications contributed and copyrighted by
Portions of this file contain modifications contributed and copyrighted by
...
@@ -18,8 +18,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
...
@@ -18,8 +18,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
59 Temple
this program; if not, write to the Free Software Foundation, Inc.,
Place, Suite 330, Boston, MA 02111-1307
USA
51 Franklin Street, Suite 500, Boston, MA 02110-1335
USA
*****************************************************************************/
*****************************************************************************/
...
...
storage/innodb_plugin/include/mtr0mtr.h
View file @
39f21868
...
@@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
...
@@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
59 Temple
this program; if not, write to the Free Software Foundation, Inc.,
Place, Suite 330, Boston, MA 02111-1307
USA
51 Franklin Street, Suite 500, Boston, MA 02110-1335
USA
*****************************************************************************/
*****************************************************************************/
...
...
storage/innodb_plugin/log/log0log.c
View file @
39f21868
/*****************************************************************************
/*****************************************************************************
Copyright (c) 1995, 2010,
Innobase Oy
. All Rights Reserved.
Copyright (c) 1995, 2010,
Oracle and/or its affiliates
. All Rights Reserved.
Copyright (c) 2009, Google Inc.
Copyright (c) 2009, Google Inc.
Portions of this file contain modifications contributed and copyrighted by
Portions of this file contain modifications contributed and copyrighted by
...
@@ -18,8 +18,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
...
@@ -18,8 +18,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
59 Temple
this program; if not, write to the Free Software Foundation, Inc.,
Place, Suite 330, Boston, MA 02111-1307
USA
51 Franklin Street, Suite 500, Boston, MA 02110-1335
USA
*****************************************************************************/
*****************************************************************************/
...
...
storage/innodb_plugin/mtr/mtr0mtr.c
View file @
39f21868
...
@@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
...
@@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
59 Temple
this program; if not, write to the Free Software Foundation, Inc.,
Place, Suite 330, Boston, MA 02111-1307
USA
51 Franklin Street, Suite 500, Boston, MA 02110-1335
USA
*****************************************************************************/
*****************************************************************************/
...
...
storage/innodb_plugin/row/row0ins.c
View file @
39f21868
...
@@ -23,6 +23,9 @@ Insert into a table
...
@@ -23,6 +23,9 @@ Insert into a table
Created 4/20/1996 Heikki Tuuri
Created 4/20/1996 Heikki Tuuri
*******************************************************/
*******************************************************/
#include "my_global.h"
/* HAVE_* */
#include "m_string.h"
/* for my_sys.h */
#include "my_sys.h"
/* DEBUG_SYNC_C */
#include "row0ins.h"
#include "row0ins.h"
#ifdef UNIV_NONINL
#ifdef UNIV_NONINL
...
@@ -2122,8 +2125,14 @@ row_ins_index_entry_low(
...
@@ -2122,8 +2125,14 @@ row_ins_index_entry_low(
if
(
UNIV_LIKELY_NULL
(
big_rec
))
{
if
(
UNIV_LIKELY_NULL
(
big_rec
))
{
rec_t
*
rec
;
rec_t
*
rec
;
ulint
*
offsets
;
ulint
*
offsets
;
DBUG_EXECUTE_IF
(
"row_ins_extern_checkpoint"
,
log_make_checkpoint_at
(
IB_ULONGLONG_MAX
,
TRUE
););
mtr_start
(
&
mtr
);
mtr_start
(
&
mtr
);
DEBUG_SYNC_C
(
"before_row_ins_extern_latch"
);
btr_cur_search_to_nth_level
(
index
,
0
,
entry
,
PAGE_CUR_LE
,
btr_cur_search_to_nth_level
(
index
,
0
,
entry
,
PAGE_CUR_LE
,
BTR_MODIFY_TREE
,
&
cursor
,
0
,
BTR_MODIFY_TREE
,
&
cursor
,
0
,
__FILE__
,
__LINE__
,
&
mtr
);
__FILE__
,
__LINE__
,
&
mtr
);
...
@@ -2131,9 +2140,11 @@ row_ins_index_entry_low(
...
@@ -2131,9 +2140,11 @@ row_ins_index_entry_low(
offsets
=
rec_get_offsets
(
rec
,
index
,
NULL
,
offsets
=
rec_get_offsets
(
rec
,
index
,
NULL
,
ULINT_UNDEFINED
,
&
heap
);
ULINT_UNDEFINED
,
&
heap
);
DEBUG_SYNC_C
(
"before_row_ins_upd_extern"
);
err
=
btr_store_big_rec_extern_fields
(
err
=
btr_store_big_rec_extern_fields
(
index
,
btr_cur_get_block
(
&
cursor
),
index
,
btr_cur_get_block
(
&
cursor
),
rec
,
offsets
,
&
mtr
,
FALSE
,
big_rec
);
rec
,
offsets
,
&
mtr
,
FALSE
,
big_rec
);
DEBUG_SYNC_C
(
"after_row_ins_upd_extern"
);
if
(
modify
)
{
if
(
modify
)
{
dtuple_big_rec_free
(
big_rec
);
dtuple_big_rec_free
(
big_rec
);
...
...
storage/innodb_plugin/row/row0upd.c
View file @
39f21868
...
@@ -23,6 +23,9 @@ Update of a row
...
@@ -23,6 +23,9 @@ Update of a row
Created 12/27/1996 Heikki Tuuri
Created 12/27/1996 Heikki Tuuri
*******************************************************/
*******************************************************/
#include "my_global.h"
/* HAVE_* */
#include "m_string.h"
/* for my_sys.h */
#include "my_sys.h"
/* DEBUG_SYNC_C */
#include "row0upd.h"
#include "row0upd.h"
#ifdef UNIV_NONINL
#ifdef UNIV_NONINL
...
@@ -1979,15 +1982,20 @@ row_upd_clust_rec(
...
@@ -1979,15 +1982,20 @@ row_upd_clust_rec(
rec_t
*
rec
;
rec_t
*
rec
;
rec_offs_init
(
offsets_
);
rec_offs_init
(
offsets_
);
mtr_start
(
mtr
);
DBUG_EXECUTE_IF
(
"row_upd_extern_checkpoint"
,
log_make_checkpoint_at
(
IB_ULONGLONG_MAX
,
TRUE
););
mtr_start
(
mtr
);
ut_a
(
btr_pcur_restore_position
(
BTR_MODIFY_TREE
,
pcur
,
mtr
));
ut_a
(
btr_pcur_restore_position
(
BTR_MODIFY_TREE
,
pcur
,
mtr
));
rec
=
btr_cur_get_rec
(
btr_cur
);
rec
=
btr_cur_get_rec
(
btr_cur
);
DEBUG_SYNC_C
(
"before_row_upd_extern"
);
err
=
btr_store_big_rec_extern_fields
(
err
=
btr_store_big_rec_extern_fields
(
index
,
btr_cur_get_block
(
btr_cur
),
rec
,
index
,
btr_cur_get_block
(
btr_cur
),
rec
,
rec_get_offsets
(
rec
,
index
,
offsets_
,
rec_get_offsets
(
rec
,
index
,
offsets_
,
ULINT_UNDEFINED
,
&
heap
),
ULINT_UNDEFINED
,
&
heap
),
mtr
,
TRUE
,
big_rec
);
mtr
,
TRUE
,
big_rec
);
DEBUG_SYNC_C
(
"after_row_upd_extern"
);
mtr_commit
(
mtr
);
mtr_commit
(
mtr
);
}
}
...
...
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