diff options
| author | unknown <monty@mysql.com> | 2004-05-24 14:42:34 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-24 14:42:34 +0300 |
| commit | 406a5fa7cd48d9bb51e513bd5040a7c3499553cc (patch) | |
| tree | 14b4172c5a85ae390a88a1f2da65454dd65a0218 /strings | |
| parent | 1d9fbbe3ce58dd6ca3793d15f793e2d9cc407133 (diff) | |
| download | mariadb-git-406a5fa7cd48d9bb51e513bd5040a7c3499553cc.tar.gz | |
After merge fixes
Remove compiler warnings
Update windows project files
VC++Files/innobase/innobase.dsp:
Update project files after merge
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Update project files after merge
VC++Files/libmysqld/libmysqld.dsp:
Update project files after merge
VC++Files/myisamchk/myisamchk.dsp:
Update project files after merge
VC++Files/myisamlog/myisamlog.dsp:
Update project files after merge
VC++Files/myisampack/myisampack.dsp:
Update project files after merge
VC++Files/mysqldemb/mysqldemb.dsp:
Update project files after merge
VC++Files/sql/mysqld.dsp:
Update project files after merge
VC++Files/strings/strings.dsp:
Update project files after merge
innobase/include/data0data.ic:
Fix compiler warning
innobase/include/mem0pool.h:
Remove reference to not existing variable (after merge fix)
innobase/srv/srv0srv.c:
Remove reference to not existing variable (after merge fix)
libmysqld/libmysqld.def:
Add function used by test programs
mysql-test/r/func_str.result:
After merge fixes
mysql-test/r/variables.result:
After merge fixes
mysql-test/t/variables.test:
After merge fixes
sql/discover.cc:
Remove not used lable
sql/opt_range.cc:
Removed compiler warnings
strings/ctype-tis620.c:
After merge fixes
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-tis620.c | 1 |
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); |