← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/rem/rem0cmp.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/rem/rem0cmp.c
705
705
        const rec_t*            rec2,   /*!< in: physical record */
706
706
        const ulint*            offsets1,/*!< in: rec_get_offsets(rec1, ...) */
707
707
        const ulint*            offsets2,/*!< in: rec_get_offsets(rec2, ...) */
708
 
        const dict_index_t*     index,  /*!< in: data dictionary index */
709
 
        ibool*                  null_eq)/*!< out: set to TRUE if
710
 
                                        found matching null values */
 
708
        const dict_index_t*     index)  /*!< in: data dictionary index */
711
709
{
712
710
        ulint           rec1_f_len;     /*!< length of current field in rec1 */
713
711
        const byte*     rec1_b_ptr;     /*!< pointer to the current byte
754
752
                    || rec2_f_len == UNIV_SQL_NULL) {
755
753
 
756
754
                        if (rec1_f_len == rec2_f_len) {
757
 
                                if (null_eq) {
758
 
                                        *null_eq = TRUE;
759
 
                                }
760
755
 
761
756
                                goto next_field;
762
757