diff options
| author | monty@mysql.com <> | 2004-11-04 15:06:24 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-04 15:06:24 +0200 |
| commit | 071001950efe9886a56ec8a365217f0d1cd92c1f (patch) | |
| tree | 9d4d27a72c18ead47fb83bd5ec0e2383cdd34ff6 /sql/sql_string.h | |
| parent | a1a27eb35a8ad7616cb08937dc4e959e2410c35b (diff) | |
| parent | f5e5dfb2f779cbb5468d63d94d659fa3d6a17e8a (diff) | |
| download | mariadb-git-071001950efe9886a56ec8a365217f0d1cd92c1f.tar.gz | |
Merge with 4.1 to get in latest bug fixes
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 d6807fa83ad..cb5b1fb25fd 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); |