diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-05-21 18:41:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-05-21 18:41:56 +0200 |
| commit | dda9577d553c9969415bc5f3d45f287e3dd6de39 (patch) | |
| tree | 06124b3cf34e6947f74d357f185626d583e845dc /sql/field.cc | |
| parent | 7c459960ece917dcdc4dedc9f3dd0c9f5d07c3b8 (diff) | |
| download | mariadb-git-dda9577d553c9969415bc5f3d45f287e3dd6de39.tar.gz | |
comments
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/field.cc b/sql/field.cc index 0f1a8a2cdb6..87fd7317e9b 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4473,7 +4473,7 @@ timestamp_auto_set_type Field_timestamp::get_auto_set_type() const } } -long Field_timestamp::get_timestamp(ulong *sec_part) const +my_time_t Field_timestamp::get_timestamp(ulong *sec_part) const { ASSERT_COLUMN_MARKED_FOR_READ; *sec_part= 0; @@ -4592,7 +4592,7 @@ longlong Field_timestamp::val_int(void) thd->time_zone_used= 1; ulong sec_part; - uint32 temp= get_timestamp(&sec_part); + my_time_t temp= get_timestamp(&sec_part); /* Field_timestamp() and Field_timestamp_hres() shares this code. @@ -4622,7 +4622,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr) thd->time_zone_used= 1; ulong sec_part; - uint32 temp= get_timestamp(&sec_part); + my_time_t temp= get_timestamp(&sec_part); if (temp == 0 && sec_part == 0) { /* Zero time is "000000" */ @@ -4682,7 +4682,7 @@ bool Field_timestamp::get_date(MYSQL_TIME *ltime, uint fuzzydate) THD *thd= table->in_use; thd->time_zone_used= 1; ulong sec_part; - uint32 temp= get_timestamp(&sec_part); + my_time_t temp= get_timestamp(&sec_part); if (temp == 0 && sec_part == 0) { /* Zero time is "000000" */ if (fuzzydate & TIME_NO_ZERO_DATE) @@ -4830,7 +4830,7 @@ void Field_timestamp_hires::store_TIME(my_time_t timestamp, ulong sec_part) store_bigendian(sec_part_shift(sec_part, dec), ptr+4, sec_part_bytes[dec]); } -long Field_timestamp_hires::get_timestamp(ulong *sec_part) const +my_time_t Field_timestamp_hires::get_timestamp(ulong *sec_part) const { ASSERT_COLUMN_MARKED_FOR_READ; *sec_part= (long)sec_part_unshift(read_bigendian(ptr+4, sec_part_bytes[dec]), dec); @@ -4844,7 +4844,7 @@ double Field_timestamp_hires::val_real(void) thd->time_zone_used= 1; ulong sec_part; - uint32 temp= get_timestamp(&sec_part); + my_time_t temp= get_timestamp(&sec_part); if (temp == 0 && sec_part == 0) return(0); |