1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge trift2.:/MySQL/M50/merge-5.0

Browse Source 
into  trift2.:/MySQL/M51/push-5.1
This commit is contained in:
joerg@trift2. 2007-12-21 13:13:22 +01:00
commit a0fbcc0326
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netware/mysql_test_run.c
View File

@ -25,6 +25,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mode.h> #include <sys/mode.h>
#include "my_manage.h" #include "my_manage.h"
#include "mysql_version.h"
#ifdef __NETWARE__ #ifdef __NETWARE__
#define strindex(a,b) ((char*)strindex(a,b)) #define strindex(a,b) ((char*)strindex(a,b))
#define strstr(a,b) ((char*)strstr(a,b)) #define strstr(a,b) ((char*)strstr(a,b))

1
netware/mysqld_safe.c
View File

@ -28,6 +28,7 @@
#include "my_config.h" #include "my_config.h"
#include "my_manage.h" #include "my_manage.h"
#include "mysql_version.h"
/****************************************************************************** /******************************************************************************

2
sql/sp_head.cc
View File

@ -482,7 +482,7 @@ sp_head::operator new(size_t size) throw()
} }
void void
sp_head::operator delete(void *ptr, size_t size) sp_head::operator delete(void *ptr, size_t size) throw()
{ {
DBUG_ENTER("sp_head::operator delete"); DBUG_ENTER("sp_head::operator delete");
MEM_ROOT own_root; MEM_ROOT own_root;