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
4da2b83a
Commit
4da2b83a
authored
Aug 23, 2016
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler error and some warnings on windows
parent
a5051cd3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
extra/perror.c
extra/perror.c
+1
-1
mysys/my_error.c
mysys/my_error.c
+1
-1
sql-common/my_time.c
sql-common/my_time.c
+2
-2
sql/derror.cc
sql/derror.cc
+1
-1
sql/handler.cc
sql/handler.cc
+1
-1
sql/net_serv.cc
sql/net_serv.cc
+1
-1
No files found.
extra/perror.c
View file @
4da2b83a
...
...
@@ -250,7 +250,7 @@ static my_bool print_win_error_msg(DWORD error, my_bool verbose)
will ignore calls to register already registered error numbers.
*/
static
const
char
**
get_handler_error_messages
()
static
const
char
**
get_handler_error_messages
(
void
)
{
return
handler_error_messages
;
}
...
...
mysys/my_error.c
View file @
4da2b83a
...
...
@@ -217,7 +217,7 @@ void my_message(uint error, const char *str, register myf MyFlags)
@retval != 0 Error
*/
int
my_error_register
(
const
char
**
(
*
get_errmsgs
)
(),
uint
first
,
uint
last
)
int
my_error_register
(
const
char
**
(
*
get_errmsgs
)
(
void
),
uint
first
,
uint
last
)
{
struct
my_err_head
*
meh_p
;
struct
my_err_head
**
search_meh_pp
;
...
...
sql-common/my_time.c
View file @
4da2b83a
...
...
@@ -224,7 +224,7 @@ my_bool check_datetime_range(const MYSQL_TIME *ltime)
ltime
->
minute
>
59
||
ltime
->
second
>
59
||
ltime
->
second_part
>
TIME_MAX_SECOND_PART
||
(
ltime
->
hour
>
(
ltime
->
time_type
==
MYSQL_TIMESTAMP_TIME
?
TIME_MAX_HOUR
:
23
));
(
uint
)
(
ltime
->
time_type
==
MYSQL_TIMESTAMP_TIME
?
TIME_MAX_HOUR
:
23
));
}
...
...
@@ -237,7 +237,7 @@ static void get_microseconds(ulong *val, MYSQL_TIME_STATUS *status,
if
(
get_digits
(
&
tmp
,
number_of_fields
,
str
,
end
,
6
))
status
->
warnings
|=
MYSQL_TIME_WARN_TRUNCATED
;
if
((
status
->
precision
=
(
*
str
-
start
))
<
6
)
*
val
=
tmp
*
log_10_int
[
6
-
(
*
str
-
start
)]
;
*
val
=
(
ulong
)
(
tmp
*
log_10_int
[
6
-
(
*
str
-
start
)])
;
else
*
val
=
tmp
;
if
(
skip_digits
(
str
,
end
))
...
...
sql/derror.cc
View file @
4da2b83a
...
...
@@ -35,7 +35,7 @@ static void init_myfunc_errs(void);
C_MODE_START
static
const
char
**
get_server_errmsgs
()
static
const
char
**
get_server_errmsgs
(
void
)
{
if
(
!
current_thd
)
return
DEFAULT_ERRMSGS
;
...
...
sql/handler.cc
View file @
4da2b83a
...
...
@@ -284,7 +284,7 @@ handler *get_ha_partition(partition_info *part_info)
static
const
char
**
handler_errmsgs
;
C_MODE_START
static
const
char
**
get_handler_errmsgs
()
static
const
char
**
get_handler_errmsgs
(
void
)
{
return
handler_errmsgs
;
}
...
...
sql/net_serv.cc
View file @
4da2b83a
...
...
@@ -831,7 +831,7 @@ my_real_read(NET *net, size_t *complen,
size_t
length
;
uint
i
,
retry_count
=
0
;
ulong
len
=
packet_error
;
my_bool
expect_error_packet
__attribute
((
unused
))
=
0
;
my_bool
expect_error_packet
__attribute
__
((
unused
))
=
0
;
thr_alarm_t
alarmed
;
#ifndef NO_ALARM
ALARM
alarm_buff
;
...
...
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