summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-24 14:42:34 +0300
committermonty@mysql.com <>2004-05-24 14:42:34 +0300
commit56c02585360c4dde0ced5792de2127f198640cea (patch)
tree14b4172c5a85ae390a88a1f2da65454dd65a0218 /strings
parenta4b0ec1eded00350f41b26c475f45fe4919924c9 (diff)
downloadmariadb-git-56c02585360c4dde0ced5792de2127f198640cea.tar.gz
After merge fixes
Remove compiler warnings Update windows project files
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-tis620.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 9b904209924..aecb4f9753c 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -630,6 +630,7 @@ static
int my_strnxfrm_tis620(CHARSET_INFO *cs __attribute__((unused)),
uchar * dest, uint len,
const uchar * src, uint srclen)
+{
len= (uint) (strmake((char*) dest, (char*) src, min(len, srclen)) -
(char*) dest);
return (int) thai2sortable(dest, len);