Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
MariaDB
Commits
61d3621e
Commit
61d3621e
authored
9 years ago
by
Alexander Barkov
Browse files
Options
Download
Email Patches
Plain Diff
Moving Field_blob::store_length() back from protected to public,
as it's needed for Cassandra in 10.0.
parent
e1b9be54
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
sql/field.h
sql/field.h
+5
-5
No files found.
sql/field.h
View file @
61d3621e
...
...
@@ -1830,11 +1830,6 @@ class Field_blob :public Field_longstr {
*/
String
value
;
void
store_length
(
uchar
*
i_ptr
,
uint
i_packlength
,
uint32
i_number
);
inline
void
store_length
(
uint32
number
)
{
store_length
(
ptr
,
packlength
,
number
);
}
public:
Field_blob
(
uchar
*
ptr_arg
,
uchar
*
null_ptr_arg
,
uchar
null_bit_arg
,
enum
utype
unireg_check_arg
,
const
char
*
field_name_arg
,
...
...
@@ -1907,6 +1902,11 @@ class Field_blob :public Field_longstr {
int
reset
(
void
)
{
bzero
(
ptr
,
packlength
+
sizeof
(
uchar
*
));
return
0
;
}
void
reset_fields
()
{
bzero
((
uchar
*
)
&
value
,
sizeof
(
value
));
}
uint32
get_field_buffer_size
(
void
)
{
return
value
.
alloced_length
();
}
void
store_length
(
uchar
*
i_ptr
,
uint
i_packlength
,
uint32
i_number
);
inline
void
store_length
(
uint32
number
)
{
store_length
(
ptr
,
packlength
,
number
);
}
inline
uint32
get_length
(
uint
row_offset
=
0
)
{
return
get_length
(
ptr
+
row_offset
,
this
->
packlength
);
}
uint32
get_length
(
const
uchar
*
ptr
,
uint
packlength
);
...
...
This diff is collapsed.
Click to expand it.
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