diff options
| author | unknown <monty@mysql.com> | 2004-06-21 10:24:40 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-21 10:24:40 +0300 |
| commit | 028dfdb3f723aed827475fe4ddcc9377f7805567 (patch) | |
| tree | 0e02d42f7a1f1f532c1d780d1c57097202d7369d /mysys | |
| parent | a3c22ae7d2d719e6e4ba052056c1dba316390985 (diff) | |
| parent | b5dfd05662464d2c19da349942914cce897cdbaf (diff) | |
| download | mariadb-git-028dfdb3f723aed827475fe4ddcc9377f7805567.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
include/my_global.h:
Auto merged
innobase/row/row0ins.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
innobase/fil/fil0fil.c:
merge (Use heikki's code)
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_tempfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index e2ad71654dc..0b337a74c19 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -83,7 +83,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, (*free)(res); file=my_create(to, 0, mode, MyFlags); } -#elif defined(HAVE_MKSTEMP) +#elif defined(HAVE_MKSTEMP) && !defined(__NETWARE__) { char prefix_buff[30]; uint pfx_len; |