From 7577c8bfc9efb21b8a8a3c08e342054e754370ab Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Fri, 29 Oct 2004 17:00:39 +0500
Subject: A fix according to Monty's request: "uint *errors" is now a
non-optional parameter in String:copy() and copy_and_convert().
---
sql/sql_string.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'sql/sql_string.h')
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);
--
cgit v1.2.1