diff options
| author | unknown <thek@kpdesk.mysql.com> | 2008-04-14 12:58:53 +0200 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2008-04-14 12:58:53 +0200 |
| commit | c9cbdf0c74b1dc3bf4f10ca873c1c911acf2a401 (patch) | |
| tree | 5a0c042d9ace20eab8942b19314ec930c62a10a5 /mysys | |
| parent | 48665aea0f3c3b4cc2f2350c887de4a34da62736 (diff) | |
| parent | ec52eac975b4252c94f74c89a559a89c4f49c059 (diff) | |
| download | mariadb-git-c9cbdf0c74b1dc3bf4f10ca873c1c911acf2a401.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
mysql-test/r/grant.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
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; |