diff options
| author | ibabaev@bk-internal.mysql.com <> | 2007-02-13 23:35:06 +0100 |
|---|---|---|
| committer | ibabaev@bk-internal.mysql.com <> | 2007-02-13 23:35:06 +0100 |
| commit | 266300142e84111c8acbfae25ff1e741f3c80f94 (patch) | |
| tree | e7c9c5ef34c15e106ecfffeae09f22401013ba30 /sql/field.h | |
| parent | 7dcdbdf37bb391df0b16d377550e70253196931f (diff) | |
| parent | 0461228a701d017754437e88b03c523b0fddbc21 (diff) | |
| download | mariadb-git-266300142e84111c8acbfae25ff1e741f3c80f94.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 7f71fd2aec8..fe3c59c89f5 100644 --- a/sql/field.h +++ b/sql/field.h @@ -29,7 +29,7 @@ class Send_field; class Protocol; struct st_cache_field; -void field_conv(Field *to,Field *from); +int field_conv(Field *to,Field *from); inline uint get_enum_pack_length(int elements) { @@ -1252,7 +1252,7 @@ public: uint max_packed_col_length(uint max_length); void free() { value.free(); } inline void clear_temporary() { bzero((char*) &value,sizeof(value)); } - friend void field_conv(Field *to,Field *from); + friend int field_conv(Field *to,Field *from); uint size_of() const { return sizeof(*this); } bool has_charset(void) const { return charset() == &my_charset_bin ? FALSE : TRUE; } |