← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/mtr/mtr0mtr.c

  • Committer: Andrew Hutchings
  • Date: 2010-12-15 18:59:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2006.
  • Revision ID: andrew@linuxjedi.co.uk-20101215185955-q12lkja8hdnpjqg7
Make the test look for drizzleadmin failure instead of success as this test is not possible to fix for success on our FreeBSD 8.0 box

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mtr/mtr0mtr.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1995, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
102
102
 
103
103
        while (offset > 0) {
104
104
                offset -= sizeof(mtr_memo_slot_t);
105
 
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
 
105
                slot = dyn_array_get_element(memo, offset);
106
106
 
107
107
                mtr_memo_slot_release(mtr, slot);
108
108
        }
159
159
                mtr_memo_slot_t* slot;
160
160
 
161
161
                offset -= sizeof(mtr_memo_slot_t);
162
 
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
 
162
                slot = dyn_array_get_element(memo, offset);
163
163
 
164
164
                mtr_memo_slot_note_modification(mtr, slot);
165
165
        }
297
297
        while (offset > savepoint) {
298
298
                offset -= sizeof(mtr_memo_slot_t);
299
299
 
300
 
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
 
300
                slot = dyn_array_get_element(memo, offset);
301
301
 
302
302
                ut_ad(slot->type != MTR_MEMO_MODIFY);
303
303
 
334
334
        while (offset > 0) {
335
335
                offset -= sizeof(mtr_memo_slot_t);
336
336
 
337
 
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
 
337
                slot = dyn_array_get_element(memo, offset);
338
338
 
339
339
                if (object == slot->object && type == slot->type) {
340
340
 
362
362
/*===========*/
363
363
        const byte*     ptr,    /*!< in: pointer from where to read */
364
364
        ulint           type,   /*!< in: MLOG_1BYTE, MLOG_2BYTES, MLOG_4BYTES */
365
 
        mtr_t*          /*mtr __attribute__((unused))*/)
 
365
        mtr_t*          mtr __attribute__((unused)))
366
366
                                /*!< in: mini-transaction handle */
367
367
{
368
368
        ut_ad(mtr->state == MTR_ACTIVE);