Drizzle

Merge lp:~linuxjedi/drizzle/drizzle-bug-597778 into lp:~drizzle-trunk/drizzle/development

  1. drizzle-bug-597778
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 1747
Merged at revision: 1748
Proposed branch: lp:~linuxjedi/drizzle/drizzle-bug-597778
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 13 lines (+2/-1)
1 file modified
drizzled/temporal.cc (+2/-1)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/drizzle-bug-597778
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+34704@code.launchpad.net

Description of the change

Timestamp cannot reliably store leap seconds, so don't try. Leave that to datetime only

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/temporal.cc'
2--- drizzled/temporal.cc 2010-08-12 16:38:48 +0000
3+++ drizzled/temporal.cc 2010-09-06 20:53:42 +0000
4@@ -1405,7 +1405,8 @@
5 bool Timestamp::is_valid() const
6 {
7 return DateTime::is_valid()
8- && in_unix_epoch_range(_years, _months, _days, _hours, _minutes, _seconds);
9+ && in_unix_epoch_range(_years, _months, _days, _hours, _minutes, _seconds)
10+ && (_seconds <= 59);
11 }
12
13 bool MicroTimestamp::is_valid() const