diff options
| author | unknown <evgen@moonbone.local> | 2005-06-22 04:48:25 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-06-22 04:48:25 +0400 |
| commit | 8fc03d970b24cd7bc61da98b8ff00033af27f809 (patch) | |
| tree | e62ded7629b972fb7bcc1b0e172fc5147ff4c229 /sql/item.h | |
| parent | 8f011afe0344f3500b4cfce4ea34be6dd5c7a0bc (diff) | |
| parent | 401fa3cb4b47e2eee663058905a4430104c9b75f (diff) | |
| download | mariadb-git-8fc03d970b24cd7bc61da98b8ff00033af27f809.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11298
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 219bbe2d59c..c912ad3f0a7 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1345,8 +1345,7 @@ public: bool send(Protocol *prot, String *tmp); void make_field(Send_field *field) { (*ref)->make_field(field); } bool fix_fields(THD *, struct st_table_list *, Item **); - int save_in_field(Field *field, bool no_conversions) - { return (*ref)->save_in_field(field, no_conversions); } + int save_in_field(Field *field, bool no_conversions); void save_org_in_field(Field *field) { (*ref)->save_org_in_field(field); } enum Item_result result_type () const { return (*ref)->result_type(); } enum_field_types field_type() const { return (*ref)->field_type(); } |