diff options
| author | msvensson@pilot.mysql.com <> | 2007-01-17 11:53:00 +0100 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2007-01-17 11:53:00 +0100 |
| commit | 51292deb36a220894367533e289be57749fd4ec5 (patch) | |
| tree | 769da28ca256c82711b0b73af5ec9e75f6f36628 /sql/field.h | |
| parent | db79dd6b730d33ab8dbd48889ab9c9793cdae4c6 (diff) | |
| parent | b711c554f55627f590126996d85578bc9a68b38e (diff) | |
| download | mariadb-git-51292deb36a220894367533e289be57749fd4ec5.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
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); |