diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-09 02:03:35 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-09 02:03:35 +0400 |
| commit | 5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7 (patch) | |
| tree | faf6e2793eae5ff3a0ec48cebf47e8045db0a6ff /sql/item.h | |
| parent | e94c1ab135e035dea4c2db9508d2d635b70bcf80 (diff) | |
| parent | 721ec081901b661b9338a47b3144c6c41829165a (diff) | |
| download | mariadb-git-5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/grant.result
Text conflict in mysql-test/t/grant.test
Text conflict in mysys/mf_loadpath.c
Text conflict in sql/slave.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 11b4199da2c..5f4f96f97d3 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2302,7 +2302,7 @@ public: class Item_hex_string: public Item_basic_constant { public: - Item_hex_string() {} + Item_hex_string(); Item_hex_string(const char *str,uint str_length); enum Type type() const { return VARBIN_ITEM; } double val_real() @@ -2322,6 +2322,8 @@ public: bool eq(const Item *item, bool binary_cmp) const; virtual Item *safe_charset_converter(CHARSET_INFO *tocs); bool check_partition_func_processor(uchar *int_arg) {return FALSE;} +private: + void hex_string_init(const char *str, uint str_length); }; |