diff options
| author | unknown <serg@serg.mylan> | 2005-05-12 14:45:24 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-12 14:45:24 +0200 |
| commit | 4e6177d87f5727d442a3c19483979394d3f9435a (patch) | |
| tree | 9a4c299a3a83bfa8542fadeb75a6574290c378c1 /sql/field.h | |
| parent | 7b36ac4819a02c25664a5f70f74262c3720eccab (diff) | |
| parent | c574528807d83fa4de899b3bb5c5d6f54405ba4c (diff) | |
| download | mariadb-git-4e6177d87f5727d442a3c19483979394d3f9435a.tar.gz | |
Merge
sql/field.h:
SCCS 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 edc3286ae8d..f68a2327dff 100644 --- a/sql/field.h +++ b/sql/field.h @@ -198,7 +198,7 @@ public: virtual Field *new_key_field(MEM_ROOT *root, struct st_table *new_table, char *new_ptr, uchar *new_null_ptr, uint new_null_bit); - virtual void move_field(char *ptr_arg,uchar *null_ptr_arg,uchar null_bit_arg) + inline void move_field(char *ptr_arg,uchar *null_ptr_arg,uchar null_bit_arg) { ptr=ptr_arg; null_ptr=null_ptr_arg; null_bit=null_bit_arg; } |