← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/rem0cmp.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/rem0cmp.h
148
148
        const rec_t*            rec2,   /*!< in: physical record */
149
149
        const ulint*            offsets1,/*!< in: rec_get_offsets(rec1, ...) */
150
150
        const ulint*            offsets2,/*!< in: rec_get_offsets(rec2, ...) */
151
 
        const dict_index_t*     index,  /*!< in: data dictionary index */
152
 
        ibool*                  null_eq);/*!< out: set to TRUE if
153
 
                                        found matching null values */
 
151
        const dict_index_t*     index); /*!< in: data dictionary index */
154
152
/*************************************************************//**
155
153
This function is used to compare two physical records. Only the common
156
154
first fields are compared, and if an externally stored field is