Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.3266

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 124310b68d5..e889bbf1930 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1284,8 +1284,8 @@ int Item::save_in_field(Field *field, bool no_conversions)
     String *result;
     CHARSET_INFO *cs= collation.collation;
     char buff[MAX_FIELD_WIDTH];		// Alloc buffer for small columns
-    str_value.set_quick(buff,sizeof(buff),cs);
-    result=val_str(&str_value);
+    String loc_value(buff, sizeof(buff), cs);
+    result=val_str(&loc_value);
     if (null_value)
       return set_field_to_null_with_conversions(field, no_conversions);
     field->set_notnull();