diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-17 11:53:00 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-17 11:53:00 +0100 |
| commit | e53f3aac027ceda31b94485bc961127f5570588b (patch) | |
| tree | 769da28ca256c82711b0b73af5ec9e75f6f36628 /sql/field.h | |
| parent | e4fefc40cf3642ed6795cb6c8bc71a7f460fad73 (diff) | |
| parent | 7118b2c33349336cd863dbb0a73a1cfbf3e48451 (diff) | |
| download | mariadb-git-e53f3aac027ceda31b94485bc961127f5570588b.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
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); |