diff options
| author | unknown <konstantin@mysql.com> | 2003-10-30 12:26:28 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2003-10-30 12:26:28 +0300 |
| commit | faeb0065b78a13823ff5dd8aed2b6efa36c31f91 (patch) | |
| tree | 1bef2246ca3b4ed5f16cae2462e6eb6ea11c1243 | |
| parent | cee3ddb401579ff062ac349103fcfcb33cb247e9 (diff) | |
| parent | 55686819aa73b09a84da05a734dc810f969a9597 (diff) | |
| download | mariadb-git-faeb0065b78a13823ff5dd8aed2b6efa36c31f91.tar.gz | |
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | mysys/my_new.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4c1777f1434..afb9c5cff5c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -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 diff --git a/mysys/my_new.cc b/mysys/my_new.cc index 5cc291af9aa..5f2da90bbd1 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -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) |