summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-15 12:42:57 +0400
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-15 12:42:57 +0400
commit5c598ba6b560b0e3596043b58491cd686dd158b9 (patch)
tree7c25e0b0634355cae94cbb3e642cfe482223af80 /sql/field.cc
parent5f3dc895b0b80228a3c09385f82be001db2bf2c4 (diff)
parent22e840d70700cd1aceec27d6aee3883203a5a566 (diff)
downloadmariadb-git-5c598ba6b560b0e3596043b58491cd686dd158b9.tar.gz
Automerge.
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index d11b509075b..98b3b91fcbd 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5307,7 +5307,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;