Merging 4.1 to 5.0.

1 files changed, 5 insertions, 2 deletions

diff --git a/sql/sql_string.h b/sql/sql_string.h
index 1c559b597ba..79365b7481b 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -190,13 +190,13 @@ public:
   bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom,
 	    CHARSET_INFO *csto);
   bool append(const String &s);
-  bool append(const char *s,uint32 arg_length=0);
+  bool append(const char *s);
+  bool append(const char *s,uint32 arg_length);
   bool append(const char *s,uint32 arg_length, CHARSET_INFO *cs);
   bool append(IO_CACHE* file, uint32 arg_length);
   bool append_with_prefill(const char *s, uint32 arg_length, 
 			   uint32 full_length, char fill_char);
   int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
-  int strstr_case(const String &s,uint32 offset=0);
   int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   bool replace(uint32 offset,uint32 arg_length,const char *to,uint32 length);
   bool replace(uint32 offset,uint32 arg_length,const String &to);
@@ -301,4 +301,7 @@ public:
     return FALSE;
   }
   void print(String *print);
+
+  /* Swap two string objects. Efficient way to exchange data without memcpy. */
+  void swap(String &s);
 };