diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/field.h | |
| parent | ca2b08e437d4c5538b40aa61fa44f68ddd74bc42 (diff) | |
| parent | 92630be0ee81604ec47cb8c7e9ab016e5449dc4d (diff) | |
| download | mariadb-git-2c6015e8dc962bef8f353af920581d9b6bd7fd82.tar.gz | |
Merge next-mr -> next-4284.
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 3dd18b4ffaa..b091431de29 100644 --- a/sql/field.h +++ b/sql/field.h @@ -787,6 +787,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 *); }; |