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/my_clock.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/my_clock.c')
| -rw-r--r-- | mysys/my_clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_clock.c b/mysys/my_clock.c index e49b2f85b66..a192bde056d 100644 --- a/mysys/my_clock.c +++ b/mysys/my_clock.c @@ -17,14 +17,14 @@ #define USES_TYPES #include "my_global.h" -#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2) +#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2) && !defined(__NETWARE__) #include "mysys_priv.h" #include <sys/times.h> #endif long my_clock(void) { -#if !defined(MSDOS) && !defined(__WIN__) && !defined(OS2) +#if !defined(MSDOS) && !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__) struct tms tmsbuf; VOID(times(&tmsbuf)); return (tmsbuf.tms_utime + tmsbuf.tms_stime); |