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 /mysql-test/r/func_timestamp.result | |
| 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 'mysql-test/r/func_timestamp.result')
| -rw-r--r-- | mysql-test/r/func_timestamp.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_timestamp.result b/mysql-test/r/func_timestamp.result index 495fedea9e6..18fcbd947e7 100644 --- a/mysql-test/r/func_timestamp.result +++ b/mysql-test/r/func_timestamp.result @@ -7,7 +7,7 @@ SELECT CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit) AS Date, UNIX_TIMESTAMP(CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit)) AS Unix FROM t1; Date Unix -1998-9-16 09:26:00 905927160 -1998-9-16 09:26:00 905927160 +1998-9-16 09:26:00 905927160.000000 +1998-9-16 09:26:00 905927160.000000 drop table t1; set time_zone= @@global.time_zone; |