summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-03-04 19:53:53 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-03-04 19:53:53 +0400
commit92754ae2db37f30ae5eebbfcfbf04b699681f816 (patch)
tree2b70663d2120be55bd50428b732af291f1ff73f2 /sql/item_strfunc.h
parent3cbb978d51ce694c941671f8bc4efd673d80e4e0 (diff)
downloadmariadb-git-92754ae2db37f30ae5eebbfcfbf04b699681f816.tar.gz
SELECT BINARY expr
is now synonim for SELECT expr COLLATE <expr_charset>_bin
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index b01787d0d20..8bfa4317698 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -581,12 +581,10 @@ public:
class Item_func_set_collation :public Item_str_func
{
- CHARSET_INFO *set_collation;
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, Item **ref);
+ Item_func_set_collation(Item *a, Item *b) :Item_str_func(a,b) {};
String *val_str(String *);
+ bool fix_fields(THD *thd,struct st_table_list *tables, Item **ref);
void fix_length_and_dec()
{ max_length = args[0]->max_length; }
bool eq(const Item *item, bool binary_cmp) const;