Skip to content

M
MariaDB
Commit 8b31de23 authored by unknown's avatar unknown
Browse files
Options

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0
parents cb31e251 543bec09
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
include/my_global.h
View file @ 8b31de23
...@@ -285,7 +285,7 @@ C_MODE_END ...@@ -285,7 +285,7 @@ C_MODE_END
# endif # endif
#endif /* TIME_WITH_SYS_TIME */ #endif /* TIME_WITH_SYS_TIME */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) #if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__APPLE__)
#define crypt unistd_crypt #define crypt unistd_crypt
#endif #endif
#include <unistd.h> #include <unistd.h>
......
ndb/src/kernel/SimBlockList.cpp
View file @ 8b31de23
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#else #else
enum SIMBLOCKLIST_DUMMY { A_VALUE = 0 }; enum SIMBLOCKLIST_DUMMY { A_VALUE = 0 };
static
void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){ void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){
char * tmp = (char *)malloc(sz); char * tmp = (char *)malloc(sz);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7