1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 6656ddb36c3..565342637ba 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1034,7 +1034,8 @@ public:
   bool zero_pack() const { return 0; }
   int reset(void)
   {
-    charset()->cset->fill(charset(),ptr,field_length,' ');
+    charset()->cset->fill(charset(),ptr,field_length,
+                          (has_charset() ? ' ' : 0));
     return 0;
   }
   int store(const char *to,uint length,CHARSET_INFO *charset);