diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-11-27 12:33:04 +0100 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-11-27 12:33:04 +0100 |
| commit | 61296d6db7c6db5eb0f57f61c3d199fe59f2a527 (patch) | |
| tree | b702ee95f5d07603e87bd4dddb4acf6ec9915ed9 /sql/my_decimal.cc | |
| parent | 4bf94e7a28e4206e8307362fb2d958369eb8bbd6 (diff) | |
| parent | d096079d330f77eebd3c3abef04236a9a4a08d7b (diff) | |
| download | mariadb-git-61296d6db7c6db5eb0f57f61c3d199fe59f2a527.tar.gz | |
auto-merge
Diffstat (limited to 'sql/my_decimal.cc')
| -rw-r--r-- | sql/my_decimal.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 651ff22d198..208ddefb890 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -214,7 +214,7 @@ my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec) date = (ltime->year*100L + ltime->month)*100L + ltime->day; if (ltime->time_type > MYSQL_TIMESTAMP_DATE) date= ((date*100L + ltime->hour)*100L+ ltime->minute)*100L + ltime->second; - if (int2my_decimal(E_DEC_FATAL_ERROR, date, FALSE, dec)) + if (int2my_decimal(E_DEC_FATAL_ERROR, ltime->neg ? -date : date, FALSE, dec)) return dec; if (ltime->second_part) { |