diff options
author | Martin Hansson <martin.hansson@oracle.com> | 2011-01-13 09:07:21 +0100 |
---|---|---|
committer | Martin Hansson <martin.hansson@oracle.com> | 2011-01-13 09:07:21 +0100 |
commit | ef6b98ee5a2d4d606e519535f70426d3db8d524a (patch) | |
tree | d1db205d8cade9fce4f01b09cf0b70cfeb9a6f31 /sql/sql_string.h | |
parent | df3b2340a84edd27cadb0b7f3b70c0c5f82cc0bd (diff) | |
parent | 716b64cdb050ff9a22457990f336ef20a7b3663a (diff) | |
download | mariadb-git-ef6b98ee5a2d4d606e519535f70426d3db8d524a.tar.gz |
Merge of fix for Bug#58165.
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 3642a96de35..dcd9975f399 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -148,6 +148,16 @@ public: Alloced_length=0; str_charset=str.str_charset; } + + + /** + Points the internal buffer to the supplied one. The old buffer is freed. + @param str Pointer to the new buffer. + @param arg_length Length of the new buffer in characters, excluding any + null character. + @param cs Character set to use for interpreting string data. + @note The new buffer will not be null terminated. + */ inline void set(char *str,uint32 arg_length, CHARSET_INFO *cs) { free(); |