diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-05-31 13:38:10 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-05-31 13:38:10 +0400 |
| commit | 27e512d394b38348497f1d3f15e917146a905242 (patch) | |
| tree | 2a3d997471c0689dad58d736d3c4a2c03c800bc2 /sql/field.cc | |
| parent | f90429ed99ae660675babb4bef1f7bdd1d7cee23 (diff) | |
| parent | 89b83c05e0946e0fdd7cf9392a5e5b7e7a78957e (diff) | |
| download | mariadb-git-27e512d394b38348497f1d3f15e917146a905242.tar.gz | |
5.1-bugteam->mysql_trunk-merge merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sql/field.cc b/sql/field.cc index fcabaeaa74d..d3de8bf6c6d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5268,7 +5268,6 @@ String *Field_time::val_str(String *val_buffer, bool Field_time::get_date(MYSQL_TIME *ltime, uint fuzzydate) { - long tmp; THD *thd= table ? table->in_use : current_thd; if (!(fuzzydate & TIME_FUZZY_DATE)) { @@ -5278,19 +5277,7 @@ bool Field_time::get_date(MYSQL_TIME *ltime, uint fuzzydate) thd->warning_info->current_row_for_warning()); return 1; } - tmp=(long) sint3korr(ptr); - ltime->neg=0; - if (tmp < 0) - { - ltime->neg= 1; - tmp=-tmp; - } - ltime->hour=tmp/10000; - tmp-=ltime->hour*10000; - ltime->minute= tmp/100; - ltime->second= tmp % 100; - ltime->year= ltime->month= ltime->day= ltime->second_part= 0; - return 0; + return Field_time::get_time(ltime); } |