diff options
author | unknown <bar@mysql.com> | 2005-10-13 22:18:35 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-10-13 22:18:35 +0500 |
commit | f6cb49223f0d765931fcdbc11b12c248cb322f43 (patch) | |
tree | 7c21450b1e7c53a944ff18fc54cb8515121e5cce /strings/ctype-tis620.c | |
parent | dc1eb889f7300d6be81f21cc0b0128c093ac9be5 (diff) | |
parent | 2ef0b3260222b5de1f6df6f1ebbdb6499201a1ad (diff) | |
download | mariadb-git-f6cb49223f0d765931fcdbc11b12c248cb322f43.tar.gz |
Merge abarkov@bk-internal:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.b9278
mysql-test/t/cast.test:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/select.result:
Auto merged
Diffstat (limited to 'strings/ctype-tis620.c')
-rw-r--r-- | strings/ctype-tis620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index 5a5f034b8da..1200644de3c 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -498,7 +498,7 @@ static uint thai2sortable(uchar *tstr, uint len) l2bias use to control position weight of l2char example (*=l2char) XX*X must come before X*XX */ - memcpy_overlap((char*) p, (char*) (p+1), tlen-1); + memmove((char*) p, (char*) (p+1), tlen-1); tstr[len-1]= l2bias + t_ctype0[1]- L2_GARAN +1; p--; continue; |