diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 20:59:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 20:59:08 +0400 |
| commit | e02ad98c63506c3260ac3a365e72886d7d02304a (patch) | |
| tree | 88ff7149921c8f4e47d5a628bfdc8f4241ad8c06 /sql/item.h | |
| parent | 7876d53b5f17e2c906f41d97e22514c1e36640bb (diff) | |
| parent | d79d0c4045f5b93ded001ca6b963727b3362cd15 (diff) | |
| download | mariadb-git-e02ad98c63506c3260ac3a365e72886d7d02304a.tar.gz | |
Merge 5.5 -> 10.0-base
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 2a4a7537a66..89d46e83e28 100644 --- a/sql/item.h +++ b/sql/item.h @@ -907,6 +907,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 |