summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-04-05 01:19:48 +0300
committermonty@mysql.com <>2005-04-05 01:19:48 +0300
commit48de1ff27744c996d7f3b63e4b75eeaeb96c9f0c (patch)
tree0a8eb6af750f9b55ae42a273743dbe99b94a08bb /sql/item_timefunc.cc
parente726bbb3d71788d61f8eeb692022086db38b0c4d (diff)
downloadmariadb-git-48de1ff27744c996d7f3b63e4b75eeaeb96c9f0c.tar.gz
Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r--sql/item_timefunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 1ea20e9d7cc..85ba3bfd0e4 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2199,7 +2199,7 @@ String *Item_char_typecast::val_str(String *str)
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_TRUNCATED_WRONG_VALUE,
ER(ER_TRUNCATED_WRONG_VALUE), char_type,
- res->c_ptr());
+ res->c_ptr_safe());
res->length((uint) length);
}
null_value= 0;