diff options
| author | unknown <jimw@rama.(none)> | 2006-09-28 18:11:29 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-09-28 18:11:29 -0700 |
| commit | 9afa051a12b9adc7285915621d0a127d670e9c21 (patch) | |
| tree | 1e61b6e0101239baef40aeb43e59feb46919c92e /sql/item_timefunc.cc | |
| parent | 1bb27aeab1f671ff313872be2cb7f1dfa0d92aea (diff) | |
| parent | 915bdfbea873dd064edc28905945f2f098bb83e2 (diff) | |
| download | mariadb-git-9afa051a12b9adc7285915621d0a127d670e9c21.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1-maint
into rama.(none):/home/jimw/my/mysql-4.1-clean
include/my_global.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/mysqld.cc:
Resolve conflict
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index febc92e34f6..02c8ab19354 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -65,7 +65,7 @@ static bool make_datetime(date_time_format_types format, TIME *ltime, ltime->hour, ltime->minute, ltime->second); break; case TIME_MICROSECOND: - length= cs->cset->snprintf(cs, buff, length, "%s%02d:%02d:%02d.%06d", + length= cs->cset->snprintf(cs, buff, length, "%s%02d:%02d:%02d.%06ld", ltime->neg ? "-" : "", ltime->hour, ltime->minute, ltime->second, ltime->second_part); @@ -82,7 +82,7 @@ static bool make_datetime(date_time_format_types format, TIME *ltime, break; case DATE_TIME_MICROSECOND: length= cs->cset->snprintf(cs, buff, length, - "%04d-%02d-%02d %02d:%02d:%02d.%06d", + "%04d-%02d-%02d %02d:%02d:%02d.%06ld", ltime->year, ltime->month, ltime->day, ltime->hour, ltime->minute, ltime->second, ltime->second_part); |