diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-07 02:30:34 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-07 02:30:34 +0200 |
| commit | 1ed1ec4c84db6e14023e55fdc6aa471c58ce71c8 (patch) | |
| tree | 467eb97b1693dd5b30f6e2b3a1e88241fad6228c /strings | |
| parent | d207a0c2f022d0a65e95cddf8a1dc957f0e0a34e (diff) | |
| download | mariadb-git-1ed1ec4c84db6e14023e55fdc6aa471c58ce71c8.tar.gz | |
Portability fix.
Fixed linking problem with InnoDB.
BUILD/compile-alpha-cxx:
Fix for using innodb
acinclude.m4:
Fix problem with linking mysqld after Heikkis last changes.
client/mysql.cc:
Fixed linking problem
client/mysqlmanager-pwgen.c:
Portability fix
innobase/que/que0que.c:
Removed some blanks
myisam/ft_boolean_search.c:
Portability fix
myisam/sort.c:
Portability fix
mysys/queues.c:
Portability fix
strings/ctype-latin1_de.c:
Portability fix
tools/mysqlmanager.c:
Portability fix
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-latin1_de.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c index afdf4a28d03..ca9ce492c4e 100644 --- a/strings/ctype-latin1_de.c +++ b/strings/ctype-latin1_de.c @@ -278,13 +278,14 @@ int my_strnxfrm_latin1_de(uchar * dest, const uchar * src, int len, int srclen) int my_strcoll_latin1_de(const uchar * s1, const uchar * s2) { /* XXX QQ: This should be fixed to not call strlen */ - return my_strnncoll_latin1_de(s1, strlen(s1), s2, strlen(s2)); + return my_strnncoll_latin1_de(s1, strlen((char*) s1), + s2, strlen((char*) s2)); } int my_strxfrm_latin1_de(uchar * dest, const uchar * src, int len) { /* XXX QQ: This should be fixed to not call strlen */ - return my_strnxfrm_latin1_de(dest, src, len, strlen(src)); + return my_strnxfrm_latin1_de(dest, src, len, strlen((char*) src)); } /* |