summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-15 12:54:40 +0400
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-15 12:54:40 +0400
commit9a0e01d73ec0f4d6ce70b055d1bdabded763921c (patch)
treeaed621d1820bd186b8619f73824e440edd34669b /sql
parentf024bde47392053b7e0801310ff235c4965aede7 (diff)
parent12f18228b421257e98fc0eff0e8cde7349b9ae7d (diff)
downloadmariadb-git-9a0e01d73ec0f4d6ce70b055d1bdabded763921c.tar.gz
Automerge.
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 99e9d7803e1..c7dd2afd934 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -4877,7 +4877,7 @@ bool Field_time::get_time(MYSQL_TIME *ltime)
ltime->neg= 1;
tmp=-tmp;
}
- ltime->day= 0;
+ ltime->year= ltime->month= ltime->day= 0;
ltime->hour= (int) (tmp/10000);
tmp-=ltime->hour*10000;
ltime->minute= (int) tmp/100;