← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0undo.c

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/trx/trx0undo.c
1938
1938
 
1939
1939
                UT_LIST_ADD_FIRST(undo_list, rseg->update_undo_cached, undo);
1940
1940
        } else {
1941
 
                ut_ad(undo->state == TRX_UNDO_TO_PURGE);
 
1941
                ut_ad(undo->state == TRX_UNDO_TO_PURGE
 
1942
                      || undo->state == TRX_UNDO_TO_FREE);
1942
1943
 
1943
1944
                trx_undo_mem_free(undo);
1944
1945
        }