summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-07 21:03:45 +0400
committerunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-07 21:03:45 +0400
commit878b4a3af450637250756abb9e0b3aa1940fc553 (patch)
tree86a649f6b4e9d781f798993b70c3b5d08f01db9c
parentc0487fb97057727c9587cc05150df64f118c2d31 (diff)
parent955e0b1304e4de75a5b6f14d20b9705255e90b56 (diff)
downloadmariadb-git-878b4a3af450637250756abb9e0b3aa1940fc553.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/hf/work/mysql-5.0.clean
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index a09c97fb356..61bbea5e615 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5639,7 +5639,7 @@ int Field_datetime::store_time(TIME *ltime,timestamp_type type)
(MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE |
MODE_INVALID_DATES))), &error))
{
- char buff[12];
+ char buff[19];
String str(buff, sizeof(buff), &my_charset_latin1);
make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,