diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-28 21:34:17 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-28 21:34:17 +0200 |
| commit | 84a9a9fe5bc7583905672c0b94011cfa1606b08d (patch) | |
| tree | 5297180578ae74db613ac34609d154992d7192eb /sql/field.cc | |
| parent | dcf6470f3100bbe7d7d78a47956b6713b0532af3 (diff) | |
| download | mariadb-git-84a9a9fe5bc7583905672c0b94011cfa1606b08d.tar.gz | |
aliases with multi-table updates / deletes
fix for a bug with derived tables and query cache
ix for a charset bug in timestamp
mysql-test/r/multi_update.result:
aliases with multi-table updates / deletes
mysql-test/r/query_cache.result:
fix for query cache with derived tables
mysql-test/t/multi_update.test:
aliases with multi-table updates / deletes
mysql-test/t/outfile.test:
Fix of bug with charset in timestamp
mysql-test/t/query_cache.test:
fix for a bug with derived tables and query cache
sql/field.cc:
fix for a charset bug in timestamp
sql/sql_parse.cc:
aliases with multi-table updates / deletes
sql/sql_yacc.yy:
aliases with multi-table updates / deletes
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 9acf2e14829..00739f1ed14 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2845,6 +2845,7 @@ 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) |