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
0488fd87
Commit
0488fd87
authored
Mar 28, 2007
by
mats@romeo.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminating some warnings.
parent
f418475e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
sql/field.h
sql/field.h
+4
-4
sql/log_event.cc
sql/log_event.cc
+0
-5
No files found.
sql/field.h
View file @
0488fd87
...
...
@@ -193,9 +193,9 @@ public:
*/
virtual
void
sql_type
(
String
&
str
)
const
=
0
;
virtual
uint
size_of
()
const
=
0
;
// For new field
inline
bool
is_null
(
uint
row_offset
=
0
)
inline
bool
is_null
(
my_ptrdiff_t
row_offset
=
0
)
{
return
null_ptr
?
(
null_ptr
[
row_offset
]
&
null_bit
?
1
:
0
)
:
table
->
null_row
;
}
inline
bool
is_real_null
(
uint
row_offset
=
0
)
inline
bool
is_real_null
(
my_ptrdiff_t
row_offset
=
0
)
{
return
null_ptr
?
(
null_ptr
[
row_offset
]
&
null_bit
?
1
:
0
)
:
0
;
}
inline
bool
is_null_in_record
(
const
uchar
*
record
)
{
...
...
@@ -210,9 +210,9 @@ public:
return
0
;
return
test
(
null_ptr
[
offset
]
&
null_bit
);
}
inline
void
set_null
(
int
row_offset
=
0
)
inline
void
set_null
(
my_ptrdiff_t
row_offset
=
0
)
{
if
(
null_ptr
)
null_ptr
[
row_offset
]
|=
null_bit
;
}
inline
void
set_notnull
(
int
row_offset
=
0
)
inline
void
set_notnull
(
my_ptrdiff_t
row_offset
=
0
)
{
if
(
null_ptr
)
null_ptr
[
row_offset
]
&=
(
uchar
)
~
null_bit
;
}
inline
bool
maybe_null
(
void
)
{
return
null_ptr
!=
0
||
table
->
maybe_null
;
}
inline
bool
real_maybe_null
(
void
)
{
return
null_ptr
!=
0
;
}
...
...
sql/log_event.cc
View file @
0488fd87
...
...
@@ -5906,12 +5906,7 @@ unpack_row(RELAY_LOG_INFO const *rli,
/*
We only unpack the field if it was non-null
*/
#ifndef DBUG_OFF
const
char
*
const
old_ptr
=
pack_ptr
;
#endif
pack_ptr
=
f
->
unpack
(
f
->
ptr
,
pack_ptr
);
DBUG_PRINT
(
"debug"
,
(
"Unpacking field '%s' from %d bytes"
,
f
->
field_name
,
pack_ptr
-
old_ptr
));
}
bitmap_set_bit
(
rw_set
,
f
->
field_index
);
...
...
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