diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-06-06 20:28:15 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-06 20:28:15 +0200 |
| commit | 4d128777dde904c5f0adab9b093e854c9c580d41 (patch) | |
| tree | 36875e84e65be596def46c5d7ce621e60abcbdae /sql/tztime.h | |
| parent | c1a92f9caeb368021d5ffbe0df237ded29692c1a (diff) | |
| download | mariadb-git-4d128777dde904c5f0adab9b093e854c9c580d41.tar.gz | |
revert a suggested "optimization" that introduced a bug
compilation error in mysys/my_getsystime.c fixed
some redundant code removed
sec_to_time, time_to_sec, from_unixtime, unix_timestamp, @@timestamp now
use decimal, not double for numbers with a fractional part.
purge_master_logs_before_date() fixed
many bugs in corner cases fixed
mysys/my_getsystime.c:
compilation failure fixed
sql/sql_parse.cc:
don't cut corners. it backfires.
Diffstat (limited to 'sql/tztime.h')
| -rw-r--r-- | sql/tztime.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/tztime.h b/sql/tztime.h index 9bf103519c4..306f76dfece 100644 --- a/sql/tztime.h +++ b/sql/tztime.h @@ -33,11 +33,11 @@ public: /** Converts local time in broken down MYSQL_TIME representation to my_time_t (UTC seconds since Epoch) represenation. - Returns 0 in case of error. Sets in_dst_time_gap to true if date provided - falls into spring time-gap (or lefts it untouched otherwise). + Returns 0 in case of error. May set error_code to ER_WARN_DATA_OUT_OF_RANGE + or ER_WARN_INVALID_TIMESTAMP, see TIME_to_timestamp()) */ virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, - my_bool *in_dst_time_gap) const = 0; + uint *error_code) const = 0; /** Converts time in my_time_t representation to local time in broken down MYSQL_TIME representation. |