summaryrefslogtreecommitdiff
path: root/client/sql_string.h
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2002-11-15 13:58:24 +0400
committerbar@bar.mysql.r18.ru <>2002-11-15 13:58:24 +0400
commit72f36713038ed034e5c7d5255dd4dbd4dd44204a (patch)
tree8b222776ed7268a2c5d949380cff24b09974222f /client/sql_string.h
parent41554da7ff56c3f8ec54929539d0729ea919521d (diff)
downloadmariadb-git-72f36713038ed034e5c7d5255dd4dbd4dd44204a.tar.gz
Copy from /sql directory
Diffstat (limited to 'client/sql_string.h')
-rw-r--r--client/sql_string.h5
1 files changed, 1 insertions, 4 deletions
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);