diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-01-28 15:06:23 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-28 15:06:23 +0400 |
| commit | 7120b6688481605551408afd5c3ea5501658e9d8 (patch) | |
| tree | 84222bc1491e8a736ff96195a1f3f23a1d0b1e00 /sql/field.h | |
| parent | a831430e628266c12cc83ba89f12f7c5cd024e44 (diff) | |
| parent | 4f6e3d22840cd14713fd0875a8da82812830b3a8 (diff) | |
| download | mariadb-git-7120b6688481605551408afd5c3ea5501658e9d8.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
sql/field.h:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index dc0b1b35d5b..f184c145b6e 100644 --- a/sql/field.h +++ b/sql/field.h @@ -788,7 +788,7 @@ public: enum ha_base_keytype key_type() const { return binary() ? HA_KEYTYPE_BINARY : HA_KEYTYPE_TEXT; } bool zero_pack() const { return 0; } - void reset(void) { bfill(ptr,field_length,' '); } + void reset(void) { charset()->fill(charset(),ptr,field_length,' '); } int store(const char *to,uint length,CHARSET_INFO *charset); int store(double nr); int store(longlong nr); |