diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-26 03:52:23 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-26 03:52:23 +0200 |
| commit | f33fb18677d673f1bcb2d617355ea3e2dbb04f48 (patch) | |
| tree | 49cc31d54c5d97d749655befa4714cd9ada479e3 /mysys | |
| parent | 00d82156b2f713963edb0cfbf40273eb27c00138 (diff) | |
| download | mariadb-git-f33fb18677d673f1bcb2d617355ea3e2dbb04f48.tar.gz | |
Patch for SCO
Update test results for MySQL 4.0
extra/resolveip.c:
Fix for SCO
mysql-test/r/backup.result:
Update test results for MySQL 4.0
mysql-test/r/bdb-crash.result:
Update test results for MySQL 4.0
mysql-test/r/bdb-deadlock.result:
Update test results for MySQL 4.0
mysys/mf_casecnv.c:
Patch for SCO
mysys/mf_qsort.c:
Patch for SCO
mysys/my_compress.c:
Patch for SCO
strings/ctype.c:
Patch for SCO
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_casecnv.c | 2 | ||||
| -rw-r--r-- | mysys/mf_qsort.c | 4 | ||||
| -rw-r--r-- | mysys/my_compress.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/mysys/mf_casecnv.c b/mysys/mf_casecnv.c index 2e0f5db83ff..ce4928cddb3 100644 --- a/mysys/mf_casecnv.c +++ b/mysys/mf_casecnv.c @@ -25,7 +25,9 @@ #include "mysys_priv.h" #include <m_ctype.h> +#ifndef SCO #include <m_string.h> +#endif /* string to uppercase */ diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index 3db6fae0520..be6e186f106 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.c @@ -23,7 +23,9 @@ #include "mysys_priv.h" -#include "m_string.h" +#ifndef SCO +#include <m_string.h> +#endif /* We need to use qsort with 2 different compare functions */ #ifdef QSORT_EXTRA_CMP_ARGUMENT diff --git a/mysys/my_compress.c b/mysys/my_compress.c index f68c7607ed2..da8f7e8b9b6 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -20,7 +20,9 @@ #include <my_global.h> #ifdef HAVE_COMPRESS #include <my_sys.h> +#ifndef SCO #include <m_string.h> +#endif #include <zlib.h> /* |