summaryrefslogtreecommitdiff
path: root/storage/maria/ma_checkpoint.c
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot4.local>2007-09-12 14:46:05 +0200
committerunknown <guilhem@gbichot4.local>2007-09-12 14:46:05 +0200
commit20d871e5de798e5f12db39fab6194ceb6e526e42 (patch)
treed5d746af84a2e3f362445505130bcaa7f949639d /storage/maria/ma_checkpoint.c
parenta5f4e79db962ad7b6e2e5e7241c4789d5630e395 (diff)
downloadmariadb-git-20d871e5de798e5f12db39fab6194ceb6e526e42.tar.gz
fix for pushbuild test failure (my_realloc() failed => checkpoint
failed => Maria didn't start => tables were created as MyISAM). storage/maria/ma_checkpoint.c: safemalloc complains if my_realloc() is passed NULL and MY_ALLOW_ZERO_PTR is not used.
Diffstat (limited to 'storage/maria/ma_checkpoint.c')
-rw-r--r--storage/maria/ma_checkpoint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index b50874e004f..ef09b650820 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -824,11 +824,11 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon)
dfiles= (PAGECACHE_FILE *)my_realloc((uchar *)dfiles,
/* avoid size of 0 for my_realloc */
max(1, nb) * sizeof(PAGECACHE_FILE),
- MYF(MY_WME));
+ MYF(MY_WME | MY_ALLOW_ZERO_PTR));
kfiles= (PAGECACHE_FILE *)my_realloc((uchar *)kfiles,
/* avoid size of 0 for my_realloc */
max(1, nb) * sizeof(PAGECACHE_FILE),
- MYF(MY_WME));
+ MYF(MY_WME | MY_ALLOW_ZERO_PTR));
if (unlikely((state_copies == NULL) ||
(dfiles == NULL) || (kfiles == NULL)))
goto err;