Commit 55bb3731 authored by unknown's avatar unknown

After merge fixes

Note that ma_test_all doesn't work for the moment.
(ma_test1 -s -M -T fails because it uses the dummy_transaction_object)


storage/maria/ma_blockrec.c:
  After merge fixes
parent 92032ac3
......@@ -2612,7 +2612,7 @@ static my_bool delete_head_or_tail(MARIA_HA *info,
uchar log_data[FILEID_STORE_SIZE + PAGE_STORE_SIZE + DIRPOS_STORE_SIZE];
LEX_STRING log_array[TRANSLOG_INTERNAL_PARTS + 1];
if (info->s->base.transactional)
if (info->s->now_transactional)
{
/* Log REDO data */
page_store(log_data+ FILEID_STORE_SIZE, page);
......@@ -2642,7 +2642,7 @@ static my_bool delete_head_or_tail(MARIA_HA *info,
PAGE_STORE_SIZE + PAGERANGE_STORE_SIZE];
LEX_STRING log_array[TRANSLOG_INTERNAL_PARTS + 1];
if (info->s->base.transactional)
if (info->s->now_transactional)
{
pagerange_store(log_data + FILEID_STORE_SIZE, 1);
page_store(log_data+ FILEID_STORE_SIZE + PAGERANGE_STORE_SIZE, page);
......
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