diff options
| author | unknown <serg@serg.mylan> | 2004-02-26 00:25:35 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-26 00:25:35 +0100 |
| commit | bda3122232ef76d8ff9a2737666e84dfba756923 (patch) | |
| tree | c2f05b905eb40df6b4b5c5bf97fcc47b4f84f3ec | |
| parent | f96960f9e1605189cc49397c64ff1cff97faedf1 (diff) | |
| parent | 056a678d1a975d85ae0c43717aae09126fbcbef3 (diff) | |
| download | mariadb-git-bda3122232ef76d8ff9a2737666e84dfba756923.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | mysys/mf_tempdir.c | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c index 1ae034af67d..4d244aa7d74 100644 --- a/mysys/mf_tempdir.c +++ b/mysys/mf_tempdir.c @@ -17,7 +17,7 @@ #include "mysys_priv.h" #include <m_string.h> -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__) #define DELIM ';' #else #define DELIM ':' @@ -35,7 +35,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist) { /* Get default temporary directory */ pathlist=getenv("TMPDIR"); /* Use this if possible */ -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__) if (!pathlist) pathlist=getenv("TEMP"); if (!pathlist) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1cc2456979a..634f24203c4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4182,7 +4182,7 @@ replicating a LOAD DATA INFILE command.", 0, 0, 0, 0, 0}, {"tmpdir", 't', "Path for temporary files. Several paths may be specified, separated by a " -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__) "semicolon (;)" #else "colon (:)" |