Commit bf1ba3d4 authored by joerg@trift2's avatar joerg@trift2

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

into  trift2.:/MySQL/M50/merge-5.0
parents f25c6ffa fb8cceb0
......@@ -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))
......
......@@ -28,6 +28,7 @@
#include "my_config.h"
#include "my_manage.h"
#include "mysql_version.h"
/******************************************************************************
......
......@@ -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;
......
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