summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-08-24 14:49:04 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-08-24 14:49:04 +0300
commit7f13b1bdd59e798af7477f4eda46ce249c4b5c4e (patch)
tree4d409fd73ae891c66dbcf263464ce85138312dac /sql/item_strfunc.h
parent029dc2b3757b0cb2ea8f5596780dd947320d6a3b (diff)
downloadmariadb-git-7f13b1bdd59e798af7477f4eda46ce249c4b5c4e.tar.gz
Adding a necessary functionality to ::store and ::save_in_field
that will take place properly after pull from 4.0, in order to handle conversions from quoted constants to bigint's.
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 7f82cd3b5de..becb7981acd 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -489,7 +489,7 @@ class Item_func_conv_charset :public Item_str_func
public:
Item_func_conv_charset(Item *a, CHARSET_INFO *cs) :Item_str_func(a)
{ conv_charset=cs; }
- bool fix_fields(THD *thd,struct st_table_list *tables);
+ bool fix_fields(THD *thd,struct st_table_list *tables,Item **ref);
String *val_str(String *);
void fix_length_and_dec();
const char *func_name() const { return "conv_charset"; }
@@ -501,7 +501,7 @@ class Item_func_set_collation :public Item_str_func
public:
Item_func_set_collation(Item *a, CHARSET_INFO *cs) :Item_str_func(a)
{ set_collation=cs; }
- bool fix_fields(THD *thd,struct st_table_list *tables);
+ bool fix_fields(THD *thd,struct st_table_list *tables, Item **ref);
String *val_str(String *);
void fix_length_and_dec()
{