diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/my_time.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 6747733da9c..d5488ce12fa 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -218,7 +218,7 @@ extern int errno; /* declare errno */ #endif /* #ifndef errno */ extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; extern char *home_dir; /* Home directory for user */ -extern char *my_progname; /* program-name (printed in errors) */ +extern const char *my_progname; /* program-name (printed in errors) */ extern char NEAR curr_dir[]; /* Current directory for user */ extern int (*error_handler_hook)(uint my_err, const char *str,myf MyFlags); extern int (*fatal_error_handler_hook)(uint my_err, const char *str, diff --git a/include/my_time.h b/include/my_time.h index aa68a6f0bbd..e52ef69475d 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -60,8 +60,8 @@ ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time); ulonglong TIME_to_ulonglong(const MYSQL_TIME *time); -bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, - int *was_cut); +my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, + int *was_cut); long calc_daynr(uint year,uint month,uint day); uint calc_days_in_year(uint year); @@ -69,7 +69,8 @@ uint calc_days_in_year(uint year); void init_time(void); my_time_t -my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap); +my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, + my_bool *in_dst_time_gap); void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type); |