diff options
| author | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
| commit | e5099a2c85468d01d084b1071f724bc20766271d (patch) | |
| tree | 50e180dfcaa058cefb382d2ab931592cddbd007d /sql/field.h | |
| parent | f83113df07d6ef8e8a6d1db8f6dc3bb90fb0652a (diff) | |
| parent | e9bce6c9d4bde35306b845e22e9b5ada69c4512f (diff) | |
| download | mariadb-git-e5099a2c85468d01d084b1071f724bc20766271d.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 5c36bf80252..e2648fb3399 100644 --- a/sql/field.h +++ b/sql/field.h @@ -894,6 +894,7 @@ public: uint is_equal(Create_field *new_field); virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data, bool low_byte_first); + static Field *create_from_item (Item *); }; |