← Back to branch summary

~brianaker/drizzle/bug730986

« back to all changes in this revision

Viewing changes to drizzled/type/time.cc

  • Committer: Mark Atwood
  • Date: 2011-07-07 02:23:07 UTC
  • mfrom: (2318.6.116 refactor18)
  • Revision ID: me@mark.atwood.name-20110707022307-4db00nqaaczzc3jv
merge lp:~olafvdspek/drizzle/refactor18

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/type/time.cc
738
738
  time_t seconds;
739
739
  struct tm *l_time,tm_tmp;
740
740
  type::Time my_time;
741
 
  type::Time::epoch_t epoch;
 
741
  type::epoch_t epoch;
742
742
  bool not_used;
743
743
 
744
744
  seconds= (time_t) time((time_t*) 0);
932
932
  }
933
933
#endif
934
934
 
935
 
  epoch= (type::Time::epoch_t) (((calc_daynr((uint32_t) t->year, (uint32_t) t->month, (uint32_t) t->day) -
 
935
  epoch= (type::epoch_t) (((calc_daynr((uint32_t) t->year, (uint32_t) t->month, (uint32_t) t->day) -
936
936
                   (long) days_at_timestart)*86400L + (long) t->hour*3600L +
937
937
                  (long) (t->minute*60 + t->second)) + (time_t) my_time_zone -
938
938
                 3600);
1046
1046
}
1047
1047
 
1048
1048
 
1049
 
void Time::store(const type::Time::epoch_t &from, bool use_localtime)
 
1049
void Time::store(const type::epoch_t &from, bool use_localtime)
1050
1050
{
1051
1051
  store(from, 0, use_localtime);
1052
1052
}
1053
1053
 
1054
 
void Time::store(const type::Time::epoch_t &from_arg, const usec_t &from_fractional_seconds, bool use_localtime)
 
1054
void Time::store(const type::epoch_t &from_arg, const usec_t &from_fractional_seconds, bool use_localtime)
1055
1055
{
1056
1056
  epoch_t from= from_arg;
1057
1057