diff options
| author | unknown <peter@mysql.com> | 2002-11-24 17:35:24 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-24 17:35:24 +0300 |
| commit | 4b85d31b2d199027d1b672f45d4de807e3603516 (patch) | |
| tree | 4ef892456daeb522bb210db0b6f8cf9de78edf5b /sql/item_strfunc.cc | |
| parent | 5b1ced458013509629c7e8e052b88910cfbb6afd (diff) | |
| parent | 4587dddab92fc96764f190b8dc1d74461846f47d (diff) | |
| download | mariadb-git-4b85d31b2d199027d1b672f45d4de807e3603516.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 133a2f4baeb..c1a9571aec7 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2079,6 +2079,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I const_item_cache=args[0]->const_item(); set_charset(conv_charset); fix_length_and_dec(); + fixed= 1; return 0; } @@ -2113,6 +2114,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables, used_tables_cache=args[0]->used_tables(); const_item_cache=args[0]->const_item(); fix_length_and_dec(); + fixed= 1; return 0; } |