Commit 6b9c2a75 authored by unknown's avatar unknown

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.
parent 9df34bd6
......@@ -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;
......
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