summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kaa@polly.local>2004-12-19 13:00:03 +0300
committerunknown <kaa@polly.local>2004-12-19 13:00:03 +0300
commit699f55e70cc957187347c77ead8c7fe280675dab (patch)
tree663db700bf9d321d72699456a48bf57e428d572b
parent2aa5d925373576715d6cd13d61dd0162ea59a937 (diff)
parent2929563fe2f96bae14790beb36e9784da7950893 (diff)
downloadmariadb-git-699f55e70cc957187347c77ead8c7fe280675dab.tar.gz
Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0
-rw-r--r--innobase/os/os0proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/os/os0proc.c b/innobase/os/os0proc.c
index 98254ae1055..dd2037695b7 100644
--- a/innobase/os/os0proc.c
+++ b/innobase/os/os0proc.c
@@ -565,7 +565,7 @@ os_mem_alloc_large(
if (ptr) {
if (set_to_zero) {
#ifdef UNIV_SET_MEM_TO_ZERO
- memset(ret, '\0', size);
+ memset(ptr, '\0', size);
#endif
}