summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-19 16:38:12 +0300
committermonty@mysql.com <>2004-05-19 16:38:12 +0300
commit86a966256be6818d20d138c1e687e1f195ddaf74 (patch)
tree8d62bd5b112fa2148c1631a51cc9fa272dcf5d16 /strings
parentfdc0f0e781051150ac187a92df1ff8f9ae3286c7 (diff)
downloadmariadb-git-86a966256be6818d20d138c1e687e1f195ddaf74.tar.gz
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-tis620.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 671aa74d806..aed8ac74949 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -462,7 +462,7 @@ static void _thai2sortable(uchar *tstr)
int len, tlen;
uchar l2bias;
- tlen= len= strlen (tstr);
+ tlen= len= strlen((char*) tstr);
l2bias= 256 - 8;
for (p= tstr; tlen > 0; p++, tlen--)
{
@@ -491,7 +491,7 @@ static void _thai2sortable(uchar *tstr)
l2bias use to control position weight of l2char
example (*=l2char) XX*X must come before X*XX
*/
- strmov(p,p+1);
+ strmov((char*) p, (char*) p+1);
tstr[len-1]= l2bias + t_ctype0[1]- L2_GARAN +1;
p--;
continue;
@@ -550,10 +550,10 @@ int my_strnxfrm_tis620(uchar * dest, const uchar * src, int len, int srclen)
{
if (len > srclen)
len= srclen ;
- strnmov(dest, src, len) ;
+ strnmov((char*) dest, (char*) src, len) ;
dest[len]= 0; /* if length(src) > len, need to put 'end of string' */
_thai2sortable(dest);
- return strlen(dest);
+ return strlen((char*) dest);
}