diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
| commit | 6c26935035ce6fc646fc448dc181d9a3a870cd54 (patch) | |
| tree | 22de11d4d65b9eb7c56b5e80669f19cf9ff242f4 /sql/item_timefunc.cc | |
| parent | 74c9f82afb1d145636b91eff4b26131fd60e4f68 (diff) | |
| parent | 37ff91b3bfdb946743e36ddd13bfda71598f45a8 (diff) | |
| download | mariadb-git-6c26935035ce6fc646fc448dc181d9a3a870cd54.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_sum.cc:
Manual merge.
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index ce760b8fd2a..a0beadcd481 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3360,6 +3360,8 @@ bool Item_func_last_day::get_date(MYSQL_TIME *ltime, uint fuzzy_date) ltime->day= days_in_month[month_idx]; if ( month_idx == 1 && calc_days_in_year(ltime->year) == 366) ltime->day= 29; + ltime->hour= ltime->minute= ltime->second= 0; + ltime->second_part= 0; ltime->time_type= MYSQL_TIMESTAMP_DATE; return 0; } |