diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-07-04 01:04:21 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-07-04 01:04:21 +0300 |
| commit | a898a7b63e65b46da82225ab8823897963dcbb3a (patch) | |
| tree | c648ce9e26f06358d8451be7580ea7571c5c4697 | |
| parent | 44cbcc8ae7aa10d511f21d20b08b8b3f13476c21 (diff) | |
| download | mariadb-git-a898a7b63e65b46da82225ab8823897963dcbb3a.tar.gz | |
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
| -rw-r--r-- | storage/maria/ma_blockrec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index 7b8bc9ea2f0..06c1df16663 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -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); |