diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-04 19:59:37 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-04 19:59:37 -0700 |
| commit | 1a40f7125f1107c1bdcb2c9a3bf71824fbcd0491 (patch) | |
| tree | 4403410878d64f356864b763876a9195f8a36f04 /sql/sp_head.cc | |
| parent | cd7b1fd9eb325f7af88f825cf1f00a15d005645c (diff) | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| download | mariadb-git-1a40f7125f1107c1bdcb2c9a3bf71824fbcd0491.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_table.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 387596263b1..4a0e18129ad 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; |