Skip to content

Commit 90b2f9a

Browse files
committed
Bug#24748505: RELWITHDEBINFO BUILD USING VS2015 FAILS FOR MYSQL-5.6 ON WINDOWS
Remove 'inline' from function definitions in my_time.c in order to fix linking issues on VS2015.
1 parent 5ab99f5 commit 90b2f9a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

sql-common/my_time.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -64,8 +64,8 @@ uint calc_days_in_year(uint year)
6464
@param tm[OUT] The value to set.
6565
@param time_type Timestasmp type
6666
*/
67-
inline void set_zero_time(MYSQL_TIME *tm,
68-
enum enum_mysql_timestamp_type time_type)
67+
void set_zero_time(MYSQL_TIME *tm,
68+
enum enum_mysql_timestamp_type time_type)
6969
{
7070
memset(tm, 0, sizeof(*tm));
7171
tm->time_type= time_type;
@@ -76,7 +76,7 @@ inline void set_zero_time(MYSQL_TIME *tm,
7676
Set hour, minute and second of a MYSQL_TIME variable to maximum time value.
7777
Unlike set_max_time(), does not touch the other structure members.
7878
*/
79-
inline void set_max_hhmmss(MYSQL_TIME *tm)
79+
void set_max_hhmmss(MYSQL_TIME *tm)
8080
{
8181
tm->hour= TIME_MAX_HOUR;
8282
tm->minute= TIME_MAX_MINUTE;
@@ -152,7 +152,7 @@ my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,
152152
@retval TRUE if the value is fatally bad.
153153
@retval FALSE if the value is Ok.
154154
*/
155-
inline my_bool check_time_mmssff_range(const MYSQL_TIME *ltime)
155+
my_bool check_time_mmssff_range(const MYSQL_TIME *ltime)
156156
{
157157
return ltime->minute >= 60 || ltime->second >= 60 ||
158158
ltime->second_part > 999999;
@@ -171,7 +171,7 @@ inline my_bool check_time_mmssff_range(const MYSQL_TIME *ltime)
171171
@retval FALSE if value is Ok.
172172
@retval TRUE if value is out of range.
173173
*/
174-
inline my_bool check_time_range_quick(const MYSQL_TIME *ltime)
174+
my_bool check_time_range_quick(const MYSQL_TIME *ltime)
175175
{
176176
longlong hour= (longlong) ltime->hour + 24LL * ltime->day;
177177
/* The input value should not be fatally bad */

0 commit comments

Comments
 (0)