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
e43156e1
Commit
e43156e1
authored
Mar 13, 2017
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing the duplicate copy of char_to_byte_length_safe().
It appeared during a merge from 10.2 to bb-10.2-ext.
parent
a4a48a37
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
10 deletions
+3
-10
sql/item.h
sql/item.h
+0
-7
sql/sql_type.h
sql/sql_type.h
+3
-3
No files found.
sql/item.h
View file @
e43156e1
...
@@ -96,13 +96,6 @@ enum precedence {
...
@@ -96,13 +96,6 @@ enum precedence {
typedef
Bounds_checked_array
<
Item
*>
Ref_ptr_array
;
typedef
Bounds_checked_array
<
Item
*>
Ref_ptr_array
;
static
inline
uint32
char_to_byte_length_safe
(
size_t
char_length_arg
,
uint32
mbmaxlen_arg
)
{
ulonglong
tmp
=
((
ulonglong
)
char_length_arg
)
*
mbmaxlen_arg
;
return
tmp
>
UINT_MAX32
?
UINT_MAX32
:
static_cast
<
uint32
>
(
tmp
);
}
bool
mark_unsupported_function
(
const
char
*
where
,
void
*
store
,
uint
result
);
bool
mark_unsupported_function
(
const
char
*
where
,
void
*
store
,
uint
result
);
/* convenience helper for mark_unsupported_function() above */
/* convenience helper for mark_unsupported_function() above */
...
...
sql/sql_type.h
View file @
e43156e1
...
@@ -184,10 +184,10 @@ class DTCollation {
...
@@ -184,10 +184,10 @@ class DTCollation {
static
inline
uint32
static
inline
uint32
char_to_byte_length_safe
(
uint32
char_length_arg
,
uint32
mbmaxlen_arg
)
char_to_byte_length_safe
(
size_t
char_length_arg
,
uint32
mbmaxlen_arg
)
{
{
ulonglong
tmp
=
((
ulonglong
)
char_length_arg
)
*
mbmaxlen_arg
;
ulonglong
tmp
=
((
ulonglong
)
char_length_arg
)
*
mbmaxlen_arg
;
return
(
tmp
>
UINT_MAX32
)
?
(
uint32
)
UINT_MAX32
:
(
uint32
)
tmp
;
return
tmp
>
UINT_MAX32
?
UINT_MAX32
:
static_cast
<
uint32
>
(
tmp
)
;
}
}
/**
/**
...
...
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