From e1fe5ab9ca3b0fb3d0188b7c1a46b15e9afebb5a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Dec 2007 18:23:11 +0100 Subject: 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 sql/sp_head.cc: Made sp_head::operator delete() match prototype, added throw() netware/mysql_test_run.c: Include "mysql_version.h" to get MYSQL_PORT defined netware/mysqld_safe.c: Include "mysql_version.h" to get MYSQL_PORT defined --- netware/mysql_test_run.c | 1 + netware/mysqld_safe.c | 1 + sql/sp_head.cc | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 3bdbc242f9e..c5974b44c1d 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -25,6 +25,7 @@ #include #include #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)) diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c index 00e7d1bcd51..6ed04c9ff0d 100644 --- a/netware/mysqld_safe.c +++ b/netware/mysqld_safe.c @@ -28,6 +28,7 @@ #include "my_config.h" #include "my_manage.h" +#include "mysql_version.h" /****************************************************************************** diff --git a/sql/sp_head.cc b/sql/sp_head.cc index e55ba81b117..c92723d6ccf 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -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; -- cgit v1.2.1 From 81c29da83fef8ee5ff3f831bcc02a16e92b2d87b Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Dec 2007 21:38:58 +0100 Subject: sp_head.cc: Corrected typo sql/sp_head.cc: Corrected typo --- sql/sp_head.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sp_head.cc b/sql/sp_head.cc index c92723d6ccf..e8ddacb820e 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -453,7 +453,7 @@ sp_head::operator new(size_t size) throw() } void -sp_head::operator delete(void *ptr, size_t size) throw() +sp_head::operator delete(void *ptr, size_t size) throw() { DBUG_ENTER("sp_head::operator delete"); MEM_ROOT own_root; -- cgit v1.2.1