diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2003-01-03 15:08:40 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2003-01-03 15:08:40 +0200 |
| commit | 164ab11b297e063b81147a5ea25d40db528d85db (patch) | |
| tree | 4e0120b3b34adf63a15d50f9129bedd4060e7758 /sql/field.cc | |
| parent | 5f4a7c1971f9022840c55c08cf20c69268463697 (diff) | |
| parent | adac21640eb07bea0e2b8d3acb44539bf4c1f5e5 (diff) | |
| download | mariadb-git-164ab11b297e063b81147a5ea25d40db528d85db.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1a0b5d496b2..13bf50a91f5 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2844,7 +2844,6 @@ String *Field_timestamp::val_str(String *val_buffer, val_buffer->alloc(field_length+1); char *to=(char*) val_buffer->ptr(),*end=to+field_length; val_buffer->length(field_length); - val_buffer->set_charset(val_ptr->charset()); #ifdef WORDS_BIGENDIAN if (table->db_low_byte_first) |