diff options
| author | monty@mashka.mysql.fi <> | 2003-01-28 08:38:28 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-28 08:38:28 +0200 |
| commit | 689578a0997f54c590bcf4791e30710602851bc4 (patch) | |
| tree | b916d4acfbe4f32ab06b052fd06c072f858bdce1 /mysys/mf_tempfile.c | |
| parent | 1bdd1d0626fdb8f858a3c4bf82e0064ee19b042d (diff) | |
| download | mariadb-git-689578a0997f54c590bcf4791e30710602851bc4.tar.gz | |
Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
Diffstat (limited to 'mysys/mf_tempfile.c')
| -rw-r--r-- | mysys/mf_tempfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index 09fde27afd6..cca80dcd552 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -24,7 +24,7 @@ #endif #ifdef HAVE_TEMPNAM -#if !defined( MSDOS) && !defined(OS2) +#if !defined(MSDOS) && !defined(OS2) && !defined(__NETWARE__) extern char **environ; #endif #endif @@ -129,7 +129,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, if (buffer[strlen(buffer)-1] == '\\') buffer[strlen(buffer)-1] = '\0'; putenv( buffer); -#else +#elif !defined(__NETWARE__) old_env= (char**) environ; if (dir) { /* Don't use TMPDIR if dir is given */ @@ -151,7 +151,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, { DBUG_PRINT("error",("Got error: %d from tempnam",errno)); } -#ifndef OS2 +#if !defined(OS2) && !defined(__NETWARE__) environ=(const char**) old_env; #endif } |