diff options
| author | unknown <guilhem@mysql.com> | 2005-11-10 15:13:12 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-11-10 15:13:12 +0100 |
| commit | 93607e351a2e5425cde17b83dc967d30c1028111 (patch) | |
| tree | 724ac82a9a2347f61b3f485aad32572fe5901bd0 /sql/item_strfunc.h | |
| parent | 50ab7648296f2d31d9e7a0ada59ab9b3f79686d3 (diff) | |
| parent | 6e56f7e0a9870aee1435a0eb2870472b2263b26d (diff) | |
| download | mariadb-git-93607e351a2e5425cde17b83dc967d30c1028111.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-4.1-gca
into mysql.com:/home/mysql_src/mysql-5.0-release
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_timefunc.h:
Auto merged
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 5889821293d..81f809d2b67 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -651,8 +651,8 @@ public: class Item_func_conv_charset :public Item_str_func { - CHARSET_INFO *conv_charset; public: + CHARSET_INFO *conv_charset; // keep it public Item_func_conv_charset(Item *a, CHARSET_INFO *cs) :Item_str_func(a) { conv_charset=cs; } String *val_str(String *); |