Commit faeb0065 authored by unknown's avatar unknown

Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/kostja/mysql/mysql-4.0-root

parents cee3ddb4 55686819
......@@ -48,6 +48,7 @@ jcole@sarvik.tfr.cafe.ee
jcole@tetra.spaceapes.com
jorge@linux.jorge.mysql.com
kaj@work.mysql.com
konstantin@mysql.com
kostja@oak.local
lenz@kallisto.mysql.com
lenz@mysql.com
......
......@@ -25,12 +25,12 @@
void *operator new (size_t sz)
{
return (void *) malloc (sz ? sz+1 : sz);
return (void *) malloc (sz ? sz : 1);
}
void *operator new[] (size_t sz)
{
return (void *) malloc (sz ? sz+1 : sz);
return (void *) malloc (sz ? sz : 1);
}
void operator delete (void *ptr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment