diff options
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r-- | sql/item_timefunc.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 4708a21be1c..9bdbcf82f2b 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -453,7 +453,7 @@ err: /** - Create a formated date/time value in a string. + Create a formatted date/time value in a string. */ static bool make_date_time(const LEX_CSTRING &format, MYSQL_TIME *l_time, @@ -1042,7 +1042,7 @@ uint week_mode(uint mode) a date at start of january) In this case one can get 53 for the first week of next year. This flag ensures that the week is relevant for the given year. Note that this flag is only - releveant if WEEK_JANUARY is not set. + relevant if WEEK_JANUARY is not set. If set Week is in range 1-53. @@ -1346,7 +1346,7 @@ bool get_interval_value(Item *args,interval_type int_type, INTERVAL *interval) if (!(res= args->val_str_ascii(&str_value))) return (1); - /* record negative intervalls in interval->neg */ + /* record negative intervals in interval->neg */ str=res->ptr(); cs= res->charset(); const char *end=str+res->length(); @@ -1568,7 +1568,7 @@ bool Item_func_from_days::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) /** - Converts current time in my_time_t to MYSQL_TIME represenatation for local + Converts current time in my_time_t to MYSQL_TIME representation for local time zone. Defines time zone (local) used for whole CURDATE function. */ void Item_func_curdate_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -1579,7 +1579,7 @@ void Item_func_curdate_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) /** - Converts current time in my_time_t to MYSQL_TIME represenatation for UTC + Converts current time in my_time_t to MYSQL_TIME representation for UTC time zone. Defines time zone (UTC) used for whole UTC_DATE function. */ void Item_func_curdate_utc::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -1659,7 +1659,7 @@ static void set_sec_part(ulong sec_part, MYSQL_TIME *ltime, Item *item) } /** - Converts current time in my_time_t to MYSQL_TIME represenatation for local + Converts current time in my_time_t to MYSQL_TIME representation for local time zone. Defines time zone (local) used for whole CURTIME function. */ void Item_func_curtime_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -1673,7 +1673,7 @@ void Item_func_curtime_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) /** - Converts current time in my_time_t to MYSQL_TIME represenatation for UTC + Converts current time in my_time_t to MYSQL_TIME representation for UTC time zone. Defines time zone (UTC) used for whole UTC_TIME function. */ void Item_func_curtime_utc::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -1728,7 +1728,7 @@ int Item_func_now_local::save_in_field(Field *field, bool no_conversions) /** - Converts current time in my_time_t to MYSQL_TIME represenatation for local + Converts current time in my_time_t to MYSQL_TIME representation for local time zone. Defines time zone (local) used for whole NOW function. */ void Item_func_now_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -1740,7 +1740,7 @@ void Item_func_now_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) /** - Converts current time in my_time_t to MYSQL_TIME represenatation for UTC + Converts current time in my_time_t to MYSQL_TIME representation for UTC time zone. Defines time zone (UTC) used for whole UTC_TIMESTAMP function. */ void Item_func_now_utc::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -1771,7 +1771,7 @@ bool Item_func_now::get_date(MYSQL_TIME *res, /** - Converts current time in my_time_t to MYSQL_TIME represenatation for local + Converts current time in my_time_t to MYSQL_TIME representation for local time zone. Defines time zone (local) used for whole SYSDATE function. */ void Item_func_sysdate_local::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time) @@ -2091,7 +2091,7 @@ bool Item_func_convert_tz::get_date(MYSQL_TIME *ltime, uint not_used; my_time_tmp= from_tz->TIME_to_gmt_sec(ltime, ¬_used); ulong sec_part= ltime->second_part; - /* my_time_tmp is guranteed to be in the allowed range */ + /* my_time_tmp is guaranteed to be in the allowed range */ if (my_time_tmp) to_tz->gmt_sec_to_TIME(ltime, my_time_tmp); /* we rely on the fact that no timezone conversion can change sec_part */ @@ -2569,7 +2569,7 @@ void Item_char_typecast::fix_length_and_dec_internal(CHARSET_INFO *from_cs) uint32 char_length; /* We always force character set conversion if cast_cs - is a multi-byte character set. It garantees that the + is a multi-byte character set. It guarantees that the result of CAST is a well-formed string. For single-byte character sets we allow just to copy from the argument. A single-byte character sets string |