diff options
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item.h b/sql/item.h index fb93e0ef8ab..727132916f0 100644 --- a/sql/item.h +++ b/sql/item.h @@ -375,9 +375,9 @@ public: bool get_time(TIME *tm); void reset() {} #ifndef EMBEDDED_LIBRARY - void (*setup_param_func)(Item_param *param, uchar **pos); + void (*set_param_func)(Item_param *param, uchar **pos); #else - void (*setup_param_func)(Item_param *param, uchar **pos, ulong data_len); + void (*set_param_func)(Item_param *param, uchar **pos, ulong data_len); #endif enum Item_result result_type () const { return item_result_type; } @@ -533,7 +533,8 @@ public: bool eq(const Item *item, bool binary_cmp) const; Item *new_item() { - return new Item_string(name, str_value.ptr(), max_length, &my_charset_bin); + return new Item_string(name, str_value.ptr(), + str_value.length(), &my_charset_bin); } String *const_string() { return &str_value; } inline void append(char *str, uint length) { str_value.append(str, length); } |