Commit bf1ba3d4 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

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

into  trift2.:/MySQL/M50/merge-5.0
parents f25c6ffa fb8cceb0

netware/mysql_test_run.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <sys/stat.h>

#include <sys/mode.h>

#include "my_manage.h"

#include "mysql_version.h"

#ifdef __NETWARE__

#define strindex(a,b) ((char*)strindex(a,b))

#define strstr(a,b)   ((char*)strstr(a,b))

netware/mysqld_safe.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include "my_config.h"

#include "my_manage.h"

#include "mysql_version.h"



/******************************************************************************

sql/sp_head.cc

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ sp_head::operator new(size_t size) throw() 
}



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");

  MEM_ROOT own_root;