diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-02 13:45:16 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-02 13:45:16 +0300 |
| commit | aecdd6993e30ee2297070fb93f31eb732fa9d7b3 (patch) | |
| tree | 73a526696b60516603d02a92eebab2b56a800ec0 /sql/item_strfunc.h | |
| parent | 5a28c2caca888be932140d12f87c496398ad4220 (diff) | |
| parent | 0d2b6552b14292648afafe7dcd73df4b7975ba65 (diff) | |
| download | mariadb-git-aecdd6993e30ee2297070fb93f31eb732fa9d7b3.tar.gz | |
merge with work
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
myisam/rt_test.c:
Merge
myisam/sp_key.c:
Merge
myisam/sp_test.c:
Merge
mysql-test/r/create.result:
Merge
sql/share/english/errmsg.txt:
Merge
sql/sql_yacc.yy:
Merge
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 4ac1b118863..28992a731fd 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -532,10 +532,7 @@ public: bool fix_fields(THD *thd,struct st_table_list *tables, Item **ref); String *val_str(String *); void fix_length_and_dec() - { - max_length = args[0]->max_length; - str_value.set_charset(set_collation); - } + { max_length = args[0]->max_length; } bool eq(const Item *item, bool binary_cmp) const; const char *func_name() const { return "set_collation"; } }; |