diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2011-01-17 15:26:13 +0300 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2011-01-17 15:26:13 +0300 |
| commit | b627c6816216eb4cabd36519e8dbaabd9e9d78c2 (patch) | |
| tree | b1742c6cd497dd90c6a1ce6deac526024f5a9f40 /sql/item_strfunc.h | |
| parent | 43558466a4e8ac6e28ae2c277760374de7d1894d (diff) | |
| parent | 18e4f23a8809a8dbeee7cf225b958991a476d1b5 (diff) | |
| download | mariadb-git-b627c6816216eb4cabd36519e8dbaabd9e9d78c2.tar.gz | |
Merging from 5.1.
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 626926213e6..24d8d354670 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -791,6 +791,7 @@ public: class Item_func_conv_charset :public Item_str_func { bool use_cached_value; + String tmp_value; public: bool safe; CHARSET_INFO *conv_charset; // keep it public |