diff options
| author | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
| commit | 6056cfadfcb07cda12f6dc01ec9c1ab07067ac69 (patch) | |
| tree | d89c080ef636608e316f1166b1628cd1d902deec /sql/item_func.h | |
| parent | 0091fa2e3266da6a17b0615a4696c25a4d36d664 (diff) | |
| parent | 446d40e880c0e6ab6ac56b0082d4883ef5c7d467 (diff) | |
| download | mariadb-git-6056cfadfcb07cda12f6dc01ec9c1ab07067ac69.tar.gz | |
Merge with 4.0.16
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 86cf19d92f3..8086e65786d 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -898,6 +898,8 @@ class Item_func_set_user_var :public Item_func enum Item_result cached_result_type; LEX_STRING name; user_var_entry *entry; + char buffer[MAX_FIELD_WIDTH]; + String value; public: Item_func_set_user_var(LEX_STRING a,Item *b) @@ -906,7 +908,7 @@ public: double val(); longlong val_int(); String *val_str(String *str); - void update_hash(void *ptr, uint length, enum Item_result type, + bool update_hash(void *ptr, uint length, enum Item_result type, CHARSET_INFO *cs, Derivation dv); bool update(); enum Item_result result_type () const { return cached_result_type; } @@ -925,7 +927,6 @@ class Item_func_get_user_var :public Item_func public: Item_func_get_user_var(LEX_STRING a): Item_func(), name(a) {} - user_var_entry *get_entry(); double val(); longlong val_int(); String *val_str(String* str); |