summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2014-02-26 15:46:13 +0200
committerunknown <sanja@montyprogram.com>2014-02-26 15:46:13 +0200
commit982607508d865d02ddd87af4aaf7c301c47cbc7e (patch)
treea0caf1674339b234a1c72cc5fdc4c3aedbe485a2 /sql/field.h
parent9d918f41d3910ed79bb71fd5405206b3a34c2a4b (diff)
downloadmariadb-git-982607508d865d02ddd87af4aaf7c301c47cbc7e.tar.gz
MDEV-4309: DBT-3 Q1 benchmark: Benchmark + profile a patch
Removed repetative calls of virtual functions. Removed check of posibility just copy field for every record.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 5a1607c1cbf..b1c27bd6018 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -75,6 +75,8 @@ struct ha_field_option_struct;
struct st_cache_field;
int field_conv(Field *to,Field *from);
+int field_conv_incompatible(Field *to,Field *from);
+bool memcpy_field_possible(Field *to, Field *from);
int truncate_double(double *nr, uint field_length, uint dec,
bool unsigned_flag, double max_value);
longlong double_to_longlong(double nr, bool unsigned_flag, bool *error);
@@ -2463,7 +2465,7 @@ public:
uint max_packed_col_length(uint max_length);
void free() { value.free(); }
inline void clear_temporary() { bzero((uchar*) &value,sizeof(value)); }
- friend int field_conv(Field *to,Field *from);
+ friend int field_conv_incompatible(Field *to,Field *from);
uint size_of() const { return sizeof(*this); }
bool has_charset(void) const
{ return charset() == &my_charset_bin ? FALSE : TRUE; }