diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2008-05-30 11:12:07 +0200 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2008-05-30 11:12:07 +0200 |
| commit | 867b60e08be9887aa6b7a61b763f44edcca1c221 (patch) | |
| tree | 2c436ada208ddcfb89206130a251a9bc72631891 /mysys | |
| parent | ecc6795c45fc676dca657d4144cc5e5a6ec47e70 (diff) | |
| parent | 14aef9781ad64ab89e1bf61ad8a09565f14f5147 (diff) | |
| download | mariadb-git-867b60e08be9887aa6b7a61b763f44edcca1c221.tar.gz | |
Merge 5.1->5.1-rpl
Fix paths and name of a few files to make it work with new mtr.pl
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 9203ce9c34e..2607ea57d08 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -202,7 +202,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) { if (mem_root->error_handler) (*mem_root->error_handler)(); - return((void*) 0); /* purecov: inspected */ + DBUG_RETURN((void*) 0); /* purecov: inspected */ } mem_root->block_num++; next->next= *prev; |