diff options
| author | unknown <monty@mysql.com> | 2005-06-06 16:54:56 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-06-06 16:54:56 +0300 |
| commit | ae96bf1a1f11b81a49e4e6387a359acc5db43ee0 (patch) | |
| tree | 2f77bf9a02e499b976579b7fa65823f77843a546 /client | |
| parent | ab2090cac75e3a6b19da3dea384c4df90d746b55 (diff) | |
| parent | 617b2e65215f40fba95838c2e7543bf6277cfd3c (diff) | |
| download | mariadb-git-ae96bf1a1f11b81a49e4e6387a359acc5db43ee0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/sql_string.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/client/sql_string.h b/client/sql_string.h index 242b31e7ed6..e284301b214 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -260,8 +260,6 @@ public: } bool fill(uint32 max_length,char fill); void strip_sp(); - inline void caseup() { my_caseup(str_charset,Ptr,str_length); } - inline void casedn() { my_casedn(str_charset,Ptr,str_length); } friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs); friend int stringcmp(const String *a,const String *b); friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); |