← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/myisam/ft_test1.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ft_test1.c
75
75
 
76
76
  /* First define 2 columns */
77
77
  recinfo[0].type=extra_field;
78
 
  recinfo[0].length= (extra_field == FIELD_BLOB ? 4 + mi_portable_sizeof_char_ptr :
 
78
  recinfo[0].length= (extra_field == FIELD_BLOB ? 4 + portable_sizeof_char_ptr :
79
79
              extra_length);
80
80
  if (extra_field == FIELD_VARCHAR)
81
81
    recinfo[0].length+= HA_VARCHAR_PACKLENGTH(extra_length);
82
82
  recinfo[1].type=key_field;
83
 
  recinfo[1].length= (key_field == FIELD_BLOB ? 4+mi_portable_sizeof_char_ptr :
 
83
  recinfo[1].length= (key_field == FIELD_BLOB ? 4+portable_sizeof_char_ptr :
84
84
                      key_length);
85
85
  if (key_field == FIELD_VARCHAR)
86
86
    recinfo[1].length+= HA_VARCHAR_PACKLENGTH(key_length);