Commit 8d676e4a authored by unknown's avatar unknown

MY_ALLOW_ZERO_PTR in my_realloc() to fix safemalloc errors in pushbuild


storage/maria/ma_recovery.c:
  MY_ALLOW_ZERO_PTR needed as log_record_buffer.str is initially NULL.
parent 0b06da5f
...@@ -107,13 +107,16 @@ static int close_all_tables(); ...@@ -107,13 +107,16 @@ static int close_all_tables();
/** @brief global [out] buffer for translog_read_record(); never shrinks */ /** @brief global [out] buffer for translog_read_record(); never shrinks */
static LEX_STRING log_record_buffer; static LEX_STRING log_record_buffer;
#define enlarge_buffer(rec) \ static void enlarge_buffer(const TRANSLOG_HEADER_BUFFER *rec)
if (log_record_buffer.length < (rec)->record_length) \ {
{ \ if (log_record_buffer.length < rec->record_length)
log_record_buffer.length= (rec)->record_length; \ {
log_record_buffer.str= my_realloc(log_record_buffer.str, \ log_record_buffer.length= rec->record_length;
(rec)->record_length, MYF(MY_WME)); \ log_record_buffer.str= my_realloc(log_record_buffer.str,
rec->record_length,
MYF(MY_WME | MY_ALLOW_ZERO_PTR));
} }
}
#define ALERT_USER() DBUG_ASSERT(0) #define ALERT_USER() DBUG_ASSERT(0)
#define LSN_IN_HEX(L) (ulong)LSN_FILE_NO(L),(ulong)LSN_OFFSET(L) #define LSN_IN_HEX(L) (ulong)LSN_FILE_NO(L),(ulong)LSN_OFFSET(L)
......
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