diff options
| author | unknown <joerg@trift2.> | 2007-12-21 13:13:22 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-12-21 13:13:22 +0100 |
| commit | c8f6457f650845ab1f9e04b2136b8351e4d465aa (patch) | |
| tree | 0050ad1d7c3f69c267460f7100da81b366e64b07 /sql/sp_head.cc | |
| parent | df4e7698e7d25a96ab80de9950bf5d2606278234 (diff) | |
| parent | c7eb461d549480cccb2ed9b1830bd03d8edda36e (diff) | |
| download | mariadb-git-c8f6457f650845ab1f9e04b2136b8351e4d465aa.tar.gz | |
Merge trift2.:/MySQL/M50/merge-5.0
into trift2.:/MySQL/M51/push-5.1
netware/mysql_test_run.c:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -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 2e36593a126..bae85d8c092 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -482,7 +482,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; |