summaryrefslogtreecommitdiff
path: root/include/my_time.h
diff options
context:
space:
mode:
authormonty@mishka.local <>2005-07-31 12:49:55 +0300
committermonty@mishka.local <>2005-07-31 12:49:55 +0300
commit8437e9c1be5b925a46640302a391af9c9cf83a30 (patch)
treec4df327e7bc6c594e03c6454dddbc63a93203c6a /include/my_time.h
parente60d786dde7bfec95a16967bb57d8c570af8ac9e (diff)
downloadmariadb-git-8437e9c1be5b925a46640302a391af9c9cf83a30.tar.gz
Fixes during review of new pushed code
Change bool in C code to my_bool Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
Diffstat (limited to 'include/my_time.h')
-rw-r--r--include/my_time.h7
1 files changed, 4 insertions, 3 deletions
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);