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
3009f4bf
Commit
3009f4bf
authored
Apr 27, 2005
by
marko@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused function rec_offs_nth_null().
rec_offs_nth_extern(): Return zero/nonzero instead of FALSE/TRUE.
parent
194593b8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
38 deletions
+13
-38
innobase/include/rem0rec.h
innobase/include/rem0rec.h
+3
-12
innobase/include/rem0rec.ic
innobase/include/rem0rec.ic
+5
-18
innobase/row/row0upd.c
innobase/row/row0upd.c
+5
-8
No files found.
innobase/include/rem0rec.h
View file @
3009f4bf
...
@@ -303,21 +303,12 @@ rec_offs_comp(
...
@@ -303,21 +303,12 @@ rec_offs_comp(
/* out: TRUE if compact format */
/* out: TRUE if compact format */
const
ulint
*
offsets
);
/* in: array returned by rec_get_offsets() */
const
ulint
*
offsets
);
/* in: array returned by rec_get_offsets() */
/**********************************************************
/**********************************************************
Returns
TRUE if the nth field of rec is SQL NULL
. */
Returns
nonzero if the extern bit is set in nth field of rec
. */
UNIV_INLINE
UNIV_INLINE
ibool
ulint
rec_offs_nth_null
(
/*==============*/
/* out: TRUE if SQL NULL */
const
ulint
*
offsets
,
/* in: array returned by rec_get_offsets() */
ulint
n
);
/* in: nth field */
/**********************************************************
Returns TRUE if the extern bit is set in nth field of rec. */
UNIV_INLINE
ibool
rec_offs_nth_extern
(
rec_offs_nth_extern
(
/*================*/
/*================*/
/* out:
TRUE
if externally stored */
/* out:
nonzero
if externally stored */
const
ulint
*
offsets
,
/* in: array returned by rec_get_offsets() */
const
ulint
*
offsets
,
/* in: array returned by rec_get_offsets() */
ulint
n
);
/* in: nth field */
ulint
n
);
/* in: nth field */
/**********************************************************
/**********************************************************
...
...
innobase/include/rem0rec.ic
View file @
3009f4bf
...
@@ -939,32 +939,19 @@ rec_offs_comp(
...
@@ -939,32 +939,19 @@ rec_offs_comp(
}
}
/**********************************************************
/**********************************************************
Returns
TRUE if the nth field of rec is SQL NULL
. */
Returns
nonzero if the extern bit is set in nth field of rec
. */
UNIV_INLINE
UNIV_INLINE
ibool
ulint
rec_offs_nth_null(
/*==============*/
/* out: TRUE if SQL NULL */
const ulint* offsets,/* in: array returned by rec_get_offsets() */
ulint n) /* in: nth field */
{
ut_ad(rec_offs_validate(NULL, NULL, offsets));
ut_ad(n < rec_offs_n_fields(offsets));
return((rec_offs_base(offsets)[1 + n] & REC_OFFS_SQL_NULL) != 0);
}
/**********************************************************
Returns TRUE if the extern bit is set in nth field of rec. */
UNIV_INLINE
ibool
rec_offs_nth_extern(
rec_offs_nth_extern(
/*================*/
/*================*/
/* out:
TRUE
if externally stored */
/* out:
nonzero
if externally stored */
const ulint* offsets,/* in: array returned by rec_get_offsets() */
const ulint* offsets,/* in: array returned by rec_get_offsets() */
ulint n) /* in: nth field */
ulint n) /* in: nth field */
{
{
ut_ad(rec_offs_validate(NULL, NULL, offsets));
ut_ad(rec_offs_validate(NULL, NULL, offsets));
ut_ad(n < rec_offs_n_fields(offsets));
ut_ad(n < rec_offs_n_fields(offsets));
return((rec_offs_base(offsets)[1 + n] & REC_OFFS_EXTERNAL) != 0);
return(UNIV_UNLIKELY(rec_offs_base(offsets)[1 + n]
& REC_OFFS_EXTERNAL));
}
}
/**********************************************************
/**********************************************************
...
...
innobase/row/row0upd.c
View file @
3009f4bf
...
@@ -815,9 +815,10 @@ row_upd_build_difference_binary(
...
@@ -815,9 +815,10 @@ row_upd_build_difference_binary(
goto
skip_compare
;
goto
skip_compare
;
}
}
extern_bit
=
rec_offs_nth_extern
(
offsets
,
i
);
extern_bit
=
upd_ext_vec_contains
(
ext_vec
,
n_ext_vec
,
i
);
if
(
extern_bit
!=
upd_ext_vec_contains
(
ext_vec
,
n_ext_vec
,
i
)
if
(
UNIV_UNLIKELY
(
extern_bit
==
!
rec_offs_nth_extern
(
offsets
,
i
))
||
!
dfield_data_is_binary_equal
(
dfield
,
len
,
data
))
{
||
!
dfield_data_is_binary_equal
(
dfield
,
len
,
data
))
{
upd_field
=
upd_get_nth_field
(
update
,
n_diff
);
upd_field
=
upd_get_nth_field
(
update
,
n_diff
);
...
@@ -826,11 +827,7 @@ row_upd_build_difference_binary(
...
@@ -826,11 +827,7 @@ row_upd_build_difference_binary(
upd_field_set_field_no
(
upd_field
,
i
,
index
,
trx
);
upd_field_set_field_no
(
upd_field
,
i
,
index
,
trx
);
if
(
upd_ext_vec_contains
(
ext_vec
,
n_ext_vec
,
i
))
{
upd_field
->
extern_storage
=
extern_bit
;
upd_field
->
extern_storage
=
TRUE
;
}
else
{
upd_field
->
extern_storage
=
FALSE
;
}
n_diff
++
;
n_diff
++
;
}
}
...
...
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