sp_head.cc:
Made sp_head::operator delete() match prototype, added throw() mysql_test_run.c, mysqld_safe.c: Include "mysql_version.h" to get MYSQL_PORT defined
This commit is contained in:
parent
8be07b88df
commit
7ca11181ac
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user