diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 14:30:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 14:30:35 +0400 |
| commit | d79d0c4045f5b93ded001ca6b963727b3362cd15 (patch) | |
| tree | 5645bdbdae6cd831846798f18815e11e21d60c2e /sql/item.h | |
| parent | a588de1fe8d6b376cabb67581374078c7a7d38d7 (diff) | |
| parent | a33bb001445d2576f15437d9392bc70736ab419a (diff) | |
| download | mariadb-git-d79d0c4045f5b93ded001ca6b963727b3362cd15.tar.gz | |
merge 5.3 -> 5.5
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index ec99e857709..27d42eb4389 100644 --- a/sql/item.h +++ b/sql/item.h @@ -897,6 +897,10 @@ public: virtual String *val_str_ascii(String *str); /* + Returns the val_str() value converted to the given character set. + */ + String *val_str(String *str, String *converter, CHARSET_INFO *to); + /* Return decimal representation of item with fixed point. SYNOPSIS |