diff options
| author | unknown <joerg@trift2.> | 2007-12-21 12:48:14 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-12-21 12:48:14 +0100 |
| commit | c7eb461d549480cccb2ed9b1830bd03d8edda36e (patch) | |
| tree | 0553275c7df45a573bc4f8269f1826e194ab266d /sql | |
| parent | 076d25220d8d5f38393b73449642db871caeeb3f (diff) | |
| parent | 81c29da83fef8ee5ff3f831bcc02a16e92b2d87b (diff) | |
| download | mariadb-git-c7eb461d549480cccb2ed9b1830bd03d8edda36e.tar.gz | |
Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M50/merge-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index e55ba81b117..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) +sp_head::operator delete(void *ptr, size_t size) throw() { DBUG_ENTER("sp_head::operator delete"); MEM_ROOT own_root; |