diff options
| author | Marc Alff <marc.alff@sun.com> | 2008-08-11 16:44:13 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2008-08-11 16:44:13 -0600 |
| commit | 7f228cf20ea057a5d677d3546c6b29742db386a7 (patch) | |
| tree | 7a10933aa27f945821757097c651e2de18b1c2aa /sql/sp_head.cc | |
| parent | b0d5c8a10bf9f165affe89d8d593888e12b694f5 (diff) | |
| parent | 2f3b860305a88e7e44ed68c5ed3a0f1837921cb0 (diff) | |
| download | mariadb-git-7f228cf20ea057a5d677d3546c6b29742db386a7.tar.gz | |
Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam
Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1
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 92dcafa7aa8..d1f920fd3a5 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -475,7 +475,7 @@ sp_head::operator new(size_t size) throw() init_sql_alloc(&own_root, MEM_ROOT_BLOCK_SIZE, MEM_ROOT_PREALLOC); sp= (sp_head *) alloc_root(&own_root, size); if (sp == NULL) - return NULL; + DBUG_RETURN(NULL); sp->main_mem_root= own_root; DBUG_PRINT("info", ("mem_root 0x%lx", (ulong) &sp->mem_root)); DBUG_RETURN(sp); |