← Back to branch summary

~percona-core/percona-server/5.1

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innodb_plugin/row/row0sel.c

  • Committer: Laurynas Biveinis
  • Date: 2013-10-23 06:43:02 UTC
  • mfrom: (595.1.1 merge-5.1.72)
  • Revision ID: laurynas.biveinis@percona.com-20131023064302-8rz0o2fwoa595k2c
Automerge lp:~laurynas-biveinis/percona-server/merge-5.1.72

Show diffs side-by-side

added added

removed removed

Lines of Context:
Percona-Server/storage/innodb_plugin/row/row0sel.c
219
219
 
220
220
                len = clust_len;
221
221
 
222
 
                if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL) {
 
222
                if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL
 
223
                    && sec_len != UNIV_SQL_NULL) {
223
224
 
224
225
                        if (rec_offs_nth_extern(clust_offs, clust_pos)) {
225
226
                                len -= BTR_EXTERN_FIELD_REF_SIZE;