← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/trx0undo.ic

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/include/trx0undo.ic
42
42
#if DATA_ROLL_PTR_LEN != 7
43
43
# error "DATA_ROLL_PTR_LEN != 7"
44
44
#endif
45
 
        ut_ad(rseg_id < 128);
 
45
        ut_ad(rseg_id < TRX_SYS_N_RSEGS);
46
46
 
47
47
        return(ut_dulint_create(is_insert * 128 * 256 * 256
48
48
                                + rseg_id * 256 * 256