diff options
| author | unknown <jani/jamppa@bk-internal.mysql.com> | 2007-01-11 16:42:48 +0100 |
|---|---|---|
| committer | unknown <jani/jamppa@bk-internal.mysql.com> | 2007-01-11 16:42:48 +0100 |
| commit | c1ad782319e313f41ac50d3e2f813948a3c6670c (patch) | |
| tree | 860d3e1e3f78acd71eb2c273baa83df9e299a7ab /sql/sql_string.h | |
| parent | 50361d9a44ddce3d0253feba9c658a17b2b0a517 (diff) | |
| parent | f6a95153667dab02d11e9d71a2bf6c389ae1571b (diff) | |
| download | mariadb-git-c1ad782319e313f41ac50d3e2f813948a3c6670c.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
libmysqld/lib_sql.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index f4250f4c70a..c1d27cb1791 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -86,7 +86,8 @@ public: { /* never called */ } ~String() { free(); } - inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; } + inline void set_charset(CHARSET_INFO *charset_arg) + { str_charset= charset_arg; } inline CHARSET_INFO *charset() const { return str_charset; } inline uint32 length() const { return str_length;} inline uint32 alloced_length() const { return Alloced_length;} |