From 08253aa93da2f900848d38eeac9393aea01155cc Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 15 Nov 2002 13:58:24 +0400 Subject: Copy from /sql directory --- client/sql_string.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'client/sql_string.h') diff --git a/client/sql_string.h b/client/sql_string.h index 4ac4308f113..42f9e446981 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -28,8 +28,6 @@ class String; int sortcmp(const String *a,const String *b); int stringcmp(const String *a,const String *b); String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); -int wild_case_compare(String &match,String &wild,char escape); -int wild_compare(String &match,String &wild,char escape); class String { @@ -179,6 +177,7 @@ public: bool copy(); // Alloc string if not alloced bool copy(const String &s); // Allocate new string bool copy(const char *s,uint32 arg_length, CHARSET_INFO *cs); // Allocate new string + 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(IO_CACHE* file, uint32 arg_length); @@ -207,8 +206,6 @@ public: friend int sortcmp(const String *a,const String *b); friend int stringcmp(const String *a,const String *b); friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); - friend int wild_case_compare(String &match,String &wild,char escape); - friend int wild_compare(String &match,String &wild,char escape); uint32 numchars(); int charpos(int i,uint32 offset=0); -- cgit v1.2.1