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
c78ae293
Commit
c78ae293
authored
Oct 09, 2019
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding missing "override" keywords, to make clang happy.
parent
6ea5c2b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
plugin/type_inet/sql_type_inet.cc
plugin/type_inet/sql_type_inet.cc
+11
-11
plugin/type_inet/sql_type_inet.h
plugin/type_inet/sql_type_inet.h
+1
-1
No files found.
plugin/type_inet/sql_type_inet.cc
View file @
c78ae293
...
@@ -852,7 +852,7 @@ class Field_inet6: public Field
...
@@ -852,7 +852,7 @@ class Field_inet6: public Field
}
}
enum_conv_type
rpl_conv_type_from
(
const
Conv_source
&
source
,
enum_conv_type
rpl_conv_type_from
(
const
Conv_source
&
source
,
const
Relay_log_info
*
rli
,
const
Relay_log_info
*
rli
,
const
Conv_param
&
param
)
const
const
Conv_param
&
param
)
const
override
{
{
if
(
type_handler
()
==
source
.
type_handler
()
||
if
(
type_handler
()
==
source
.
type_handler
()
||
(
source
.
type_handler
()
==
&
type_handler_string
&&
(
source
.
type_handler
()
==
&
type_handler_string
&&
...
@@ -944,7 +944,7 @@ class Field_inet6: public Field
...
@@ -944,7 +944,7 @@ class Field_inet6: public Field
uint
row_pack_length
()
const
override
{
return
pack_length
();
}
uint
row_pack_length
()
const
override
{
return
pack_length
();
}
Binlog_type_info
binlog_type_info
()
const
Binlog_type_info
binlog_type_info
()
const
override
{
{
DBUG_ASSERT
(
type
()
==
binlog_type
());
DBUG_ASSERT
(
type
()
==
binlog_type
());
return
Binlog_type_info_fixed_string
(
Field_inet6
::
binlog_type
(),
return
Binlog_type_info_fixed_string
(
Field_inet6
::
binlog_type
(),
...
@@ -979,46 +979,46 @@ class Item_typecast_inet6: public Item_func
...
@@ -979,46 +979,46 @@ class Item_typecast_inet6: public Item_func
return
args
[
0
]
->
eq
(
cast
->
args
[
0
],
binary_cmp
);
return
args
[
0
]
->
eq
(
cast
->
args
[
0
],
binary_cmp
);
}
}
const
char
*
func_name
()
const
override
{
return
"cast_as_inet6"
;
}
const
char
*
func_name
()
const
override
{
return
"cast_as_inet6"
;
}
void
print
(
String
*
str
,
enum_query_type
query_type
)
void
print
(
String
*
str
,
enum_query_type
query_type
)
override
{
{
str
->
append
(
STRING_WITH_LEN
(
"cast("
));
str
->
append
(
STRING_WITH_LEN
(
"cast("
));
args
[
0
]
->
print
(
str
,
query_type
);
args
[
0
]
->
print
(
str
,
query_type
);
str
->
append
(
STRING_WITH_LEN
(
" as inet6)"
));
str
->
append
(
STRING_WITH_LEN
(
" as inet6)"
));
}
}
bool
fix_length_and_dec
()
bool
fix_length_and_dec
()
override
{
{
Type_std_attributes
::
operator
=
(
Type_std_attributes_inet6
());
Type_std_attributes
::
operator
=
(
Type_std_attributes_inet6
());
return
false
;
return
false
;
}
}
String
*
val_str
(
String
*
to
)
String
*
val_str
(
String
*
to
)
override
{
{
Inet6_null
tmp
(
args
[
0
]);
Inet6_null
tmp
(
args
[
0
]);
return
(
null_value
=
tmp
.
is_null
()
||
tmp
.
to_string
(
to
))
?
NULL
:
to
;
return
(
null_value
=
tmp
.
is_null
()
||
tmp
.
to_string
(
to
))
?
NULL
:
to
;
}
}
longlong
val_int
()
longlong
val_int
()
override
{
{
return
0
;
return
0
;
}
}
double
val_real
()
double
val_real
()
override
{
{
return
0
;
return
0
;
}
}
my_decimal
*
val_decimal
(
my_decimal
*
to
)
my_decimal
*
val_decimal
(
my_decimal
*
to
)
override
{
{
my_decimal_set_zero
(
to
);
my_decimal_set_zero
(
to
);
return
to
;
return
to
;
}
}
bool
get_date
(
THD
*
thd
,
MYSQL_TIME
*
ltime
,
date_mode_t
fuzzydate
)
bool
get_date
(
THD
*
thd
,
MYSQL_TIME
*
ltime
,
date_mode_t
fuzzydate
)
override
{
{
set_zero_time
(
ltime
,
MYSQL_TIMESTAMP_TIME
);
set_zero_time
(
ltime
,
MYSQL_TIMESTAMP_TIME
);
return
false
;
return
false
;
}
}
bool
val_native
(
THD
*
thd
,
Native
*
to
)
bool
val_native
(
THD
*
thd
,
Native
*
to
)
override
{
{
Inet6_null
tmp
(
args
[
0
]);
Inet6_null
tmp
(
args
[
0
]);
return
null_value
=
tmp
.
is_null
()
||
tmp
.
to_native
(
to
);
return
null_value
=
tmp
.
is_null
()
||
tmp
.
to_native
(
to
);
}
}
Item
*
get_copy
(
THD
*
thd
)
Item
*
get_copy
(
THD
*
thd
)
override
{
return
get_item_copy
<
Item_typecast_inet6
>
(
thd
,
this
);
}
{
return
get_item_copy
<
Item_typecast_inet6
>
(
thd
,
this
);
}
};
};
...
...
plugin/type_inet/sql_type_inet.h
View file @
c78ae293
...
@@ -355,7 +355,7 @@ class Type_handler_inet6: public Type_handler
...
@@ -355,7 +355,7 @@ class Type_handler_inet6: public Type_handler
return
DYN_COL_STRING
;
return
DYN_COL_STRING
;
}
}
uint32
max_display_length_for_field
(
const
Conv_source
&
src
)
const
uint32
max_display_length_for_field
(
const
Conv_source
&
src
)
const
override
{
{
return
Inet6
::
max_char_length
();
return
Inet6
::
max_char_length
();
}
}
...
...
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