diff options
| author | unknown <iggy@recycle.(none)> | 2007-03-20 10:54:56 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-03-20 10:54:56 -0400 |
| commit | 14655649efeef29a47c3ef6527806ab7d2ea5ae7 (patch) | |
| tree | 89d98cdcae5530c2708979517d9dc11f32fc471f /mysys/array.c | |
| parent | feb2be208341ea249c22f360181963786b1e3e24 (diff) | |
| parent | 6fb66342b36d0a5e3ed3aea53b86fc6d719a9cd9 (diff) | |
| download | mariadb-git-14655649efeef29a47c3ef6527806ab7d2ea5ae7.tar.gz | |
Merge recycle.(none):/src/bug23736/my50-bug23736
into recycle.(none):/src/bug23736/my51-bug23736
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
mysys/array.c:
Auto merged
mysys/mf_tempdir.c:
Manual Merge.
Diffstat (limited to 'mysys/array.c')
| -rw-r--r-- | mysys/array.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysys/array.c b/mysys/array.c index 8f4a6087c00..60f5b255e18 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -15,10 +15,6 @@ /* Handling of arrays that can grow dynamicly. */ -#if defined(WIN32) || defined(__WIN__) -#undef SAFEMALLOC /* Problems with threads */ -#endif - #include "mysys_priv.h" #include "m_string.h" |