diff options
| author | unknown <bar@mysql.com> | 2004-10-29 17:00:39 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-10-29 17:00:39 +0500 |
| commit | 6e781e11a9f7606b8b41532c382df9cf00617d17 (patch) | |
| tree | 9cc9765d8b1a393421a6e3df083461c690d1c028 /sql/sql_string.h | |
| parent | fcb322279eba22dcc29093d0212ea5a21f78ed59 (diff) | |
| download | mariadb-git-6e781e11a9f7606b8b41532c382df9cf00617d17.tar.gz | |
A fix according to Monty's request:
"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index de8f4af58d9..a8fb9574c0b 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -29,7 +29,7 @@ int sortcmp(const String *a,const String *b, CHARSET_INFO *cs); String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, const char *from, uint32 from_length, - CHARSET_INFO *from_cs, uint *errors= 0); + CHARSET_INFO *from_cs, uint *errors); class String { @@ -199,7 +199,7 @@ public: CHARSET_INFO *cs); bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs); bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom, - CHARSET_INFO *csto, uint *errors= 0); + CHARSET_INFO *csto, uint *errors); bool append(const String &s); bool append(const char *s); bool append(const char *s,uint32 arg_length); |