summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-11-19 09:13:38 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-04 10:41:51 +0100
commit2ae7541bcf93985302bc7efb2629e6f623ccfc64 (patch)
treed0b14c1dba4bffc2ae82f2d51f1f9ef4ebf7035a /sql/sql_string.h
parent0d30423900dd3a384f061c32f6ec3de9c11cdde9 (diff)
downloadmariadb-git-2ae7541bcf93985302bc7efb2629e6f623ccfc64.tar.gz
cleanup: s/const CHARSET_INFO/CHARSET_INFO/
as CHARSET_INFO is already const, using const on it is redundant and results in compiler warnings (on Windows)
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index dff2a457044..7f6aed9f804 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -35,9 +35,9 @@ typedef struct st_mem_root MEM_ROOT;
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
inline uint32 copy_and_convert(char *to, uint32 to_length,
- const CHARSET_INFO *to_cs,
+ CHARSET_INFO *to_cs,
const char *from, uint32 from_length,
- const CHARSET_INFO *from_cs, uint *errors)
+ CHARSET_INFO *from_cs, uint *errors)
{
return my_convert(to, to_length, to_cs, from, from_length, from_cs, errors);
}
@@ -575,11 +575,11 @@ class StringBuffer : public String
public:
StringBuffer() : String(buff, buff_sz, &my_charset_bin) { length(0); }
- explicit StringBuffer(const CHARSET_INFO *cs) : String(buff, buff_sz, cs)
+ explicit StringBuffer(CHARSET_INFO *cs) : String(buff, buff_sz, cs)
{
length(0);
}
- StringBuffer(const char *str, size_t length, const CHARSET_INFO *cs)
+ StringBuffer(const char *str, size_t length, CHARSET_INFO *cs)
: String(buff, buff_sz, cs)
{
set(str, length, cs);