Merge trift2.:/MySQL/M50/merge-5.0
into trift2.:/MySQL/M51/push-5.1
This commit is contained in:
commit
a0fbcc0326
@ -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))
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
#include "my_config.h"
|
#include "my_config.h"
|
||||||
#include "my_manage.h"
|
#include "my_manage.h"
|
||||||
|
#include "mysql_version.h"
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user