diff options
| author | unknown <sanja@montyprogram.com> | 2013-11-11 23:40:53 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-11-11 23:40:53 +0200 |
| commit | 55de9b0468c65b7277b7ca6978f4e01c01af1206 (patch) | |
| tree | a98623574e326aea7b4b16d768947ac24dc80962 /sql/item.h | |
| parent | 383de0fd1f7b855276f5bec37f38de6dbf70e938 (diff) | |
| parent | 3a75900b91ffb4d49396d8f83e0b55b392e83a2a (diff) | |
| download | mariadb-git-55de9b0468c65b7277b7ca6978f4e01c01af1206.tar.gz | |
merge 10-base->10.0
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 31a638fc9ec..f5917f7d9c3 100644 --- a/sql/item.h +++ b/sql/item.h @@ -908,6 +908,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 |