← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/log0recv.h

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/log0recv.h
368
368
struct recv_addr_struct{
369
369
        enum recv_addr_state state;
370
370
                                /*!< recovery state of the page */
371
 
        unsigned        space:32;/*!< space id */
372
 
        unsigned        page_no:32;/*!< page number */
 
371
        ulint           space;  /*!< space id */
 
372
        ulint           page_no;/*!< page number */
373
373
        UT_LIST_BASE_NODE_T(recv_t)
374
374
                        rec_list;/*!< list of log records for this page */
375
375
        hash_node_t     addr_hash;/*!< hash node in the hash bucket chain */